X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fg_world.qc;h=05d4b14dcc856ae6b4801f997b55d007071fc623;hb=5d3aed9a8ec0ff58a4f3d08d679e9ddcf8fff579;hp=85bab3c55685cf5202c36bc9659b758a5d5f243a;hpb=48e191468eb22f3b56fc45556446c0e293368d5e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 85bab3c55..05d4b14dc 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -654,8 +654,8 @@ void spawnfunc_worldspawn (void)
 	InitGameplayMode();
 	readlevelcvars();
 	GrappleHookInit();
+	ArcInit();
 	ElectroInit();
-	LaserInit();
 
 	player_count = 0;
 	bot_waypoints_for_items = autocvar_g_waypoints_for_items;
@@ -702,6 +702,10 @@ void spawnfunc_worldspawn (void)
 		if(autocvar_g_weaponarena != "0")
 			s = strcat(s, ":", autocvar_g_weaponarena, " arena");
 
+		// TODO to mutator system
+		if(autocvar_g_norecoil)
+			s = strcat(s, ":norecoil");
+
 		// TODO to mutator system
 		if(autocvar_g_powerups == 0)
 			s = strcat(s, ":no_powerups");
@@ -879,7 +883,7 @@ void spawnfunc_worldspawn (void)
 		s = "";
 		n = tokenize_console(cvar_string("sv_curl_serverpackages"));
 		for(i = 0; i < n; ++i)
-			if(substring(argv(i), -14, -1) != "-serverpackage.txt")
+			if(substring(argv(i), -18, -1) != "-serverpackage.txt")
 			if(substring(argv(i), -14, -1) != ".serverpackage") // OLD legacy
 				s = strcat(s, " ", argv(i));
 		fd = search_begin("*-serverpackage.txt", TRUE, FALSE);