about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/server/server.c2
-rw-r--r--src/game/server/srv_common.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/server/server.c b/src/engine/server/server.c
index 962ba650..33bea042 100644
--- a/src/engine/server/server.c
+++ b/src/engine/server/server.c
@@ -770,9 +770,9 @@ static int server_run()
 						snapstorage_purge_all(&clients[c].snapshots);
 					}
 					
-					mods_init();
 					game_start_time = time_get();
 					current_tick = 0;
+					mods_init();
 				}
 				else
 				{
diff --git a/src/game/server/srv_common.cpp b/src/game/server/srv_common.cpp
index 21400d63..d3d9855c 100644
--- a/src/game/server/srv_common.cpp
+++ b/src/game/server/srv_common.cpp
@@ -166,7 +166,7 @@ void gameobject::tick()
 	{
 		warmup--;
 		if(!warmup)
-			resetgame();
+			startround();
 	}
 	
 	if(game_over_tick != -1)