From: terencehill <piuntn@gmail.com>
Date: Tue, 21 Aug 2018 11:52:30 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_ai
X-Git-Tag: xonotic-v0.8.5~1923^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=338f8f4862627b3ee04cbdd20dc5590973614e01;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/bot_ai

# Conflicts:
#	.gitlab-ci.yml
#	qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
---

338f8f4862627b3ee04cbdd20dc5590973614e01
diff --cc qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
index 7c0356b38,b77414c3d..1da7e81fb
--- a/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
+++ b/qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
@@@ -164,15 -176,8 +176,8 @@@ void ka_DropEvent(entity plyr) // runs 
  	ball.effects &= ~EF_NODRAW;
  	setorigin(ball, plyr.origin + '0 0 10');
  	ball.velocity = '0 0 200' + '0 100 0'*crandom() + '100 0 0'*crandom();
- 	entity e = ball.owner;
  	ball.owner = NULL;
- 	e.ballcarried = NULL;
- 	GameRules_scoring_vip(e, false);
- 	navigation_dynamicgoal_set(ball, e);
- 
- 	// reset the player effects
- 	plyr.glow_trail = false;
- 	plyr.effects &= ~autocvar_g_keepaway_ballcarrier_effects;
 -	navigation_dynamicgoal_set(ball);
++	navigation_dynamicgoal_set(ball, plyr);
  
  	// messages and sounds
  	ka_EventLog("dropped", plyr);