From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 5 Oct 2015 07:26:29 +0000 (+1100)
Subject: Nexball: mutator lock ballstealer
X-Git-Tag: xonotic-v0.8.2~1874^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6281064381ca0f8062c56d3e3c7b61a6e420025;p=xonotic%2Fxonotic-data.pk3dir.git

Nexball: mutator lock ballstealer
---

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index 8f0ce7e44..2e152bb68 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -1023,10 +1023,12 @@ MUTATOR_DEFINITION(gamemode_nexball)
 		radar_showennemies = autocvar_g_nexball_radar_showallplayers;
 
 		InitializeEntity(world, nb_delayedinit, INITPRIO_GAMETYPE);
+		WEP_NEXBALL.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 	}
 
 	MUTATOR_ONROLLBACK_OR_REMOVE
 	{
+		WEP_NEXBALL.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
 		// we actually cannot roll back nb_delayedinit here
 		// BUT: we don't need to! If this gets called, adding always
 		// succeeds.
diff --git a/qcsrc/server/mutators/gamemode_nexball_weapon.qc b/qcsrc/server/mutators/gamemode_nexball_weapon.qc
index 8d11877fe..ae882bb32 100644
--- a/qcsrc/server/mutators/gamemode_nexball_weapon.qc
+++ b/qcsrc/server/mutators/gamemode_nexball_weapon.qc
@@ -2,7 +2,7 @@
 #define GAMEMODE_NEXBALL_WEAPON_H
 
 CLASS(BallStealer, PortoLaunch)
-/* flags     */ ATTRIB(BallStealer, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN);
+/* flags     */ ATTRIB(BallStealer, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
 /* impulse   */ ATTRIB(BallStealer, impulse, int, 0);
 /* refname   */ ATTRIB(BallStealer, netname, string, "ballstealer");
 /* wepname   */ ATTRIB(BallStealer, message, string, _("Ball Stealer"));