X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_nexball.qc;h=1b94746356c85ee15576d809f3e0ce3b57f9c076;hb=e332988cce112231a09d8c9c8c88d889a5fbea83;hp=ec8de781e257fa754167f2c028c3e6c5dc5ea3cc;hpb=b41f7ee415c9cc35d6304ca237986a9e445ffd4c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index ec8de781e..1b9474635 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -117,7 +117,7 @@ void GiveBall(entity plyr, entity ball)
 	ball.owner = ball.pusher = plyr; //"owner" is set to the player carrying, "pusher" to the last player who touched it
 	ball.team = plyr.team;
 	plyr.ballcarried = ball;
-	ball.dropperid = plyr.playerid;
+	ball.ctf_dropper = plyr;
 
 	plyr.effects |= autocvar_g_nexball_basketball_effects_default;
 	ball.effects &~= autocvar_g_nexball_basketball_effects_default;
@@ -287,7 +287,7 @@ void basketball_touch(void)
 		football_touch();
 		return;
 	}
-	if(!self.cnt && other.classname == "player" && (other.playerid != self.dropperid || time > self.ctf_droptime + autocvar_g_nexball_delay_collect))
+	if(!self.cnt && other.classname == "player" && (other != self.ctf_dropper || time > self.ctf_droptime + autocvar_g_nexball_delay_collect))
 	{
 		if(other.health <= 0)
 			return;