From: Mario <mario@smbclan.net>
Date: Sat, 3 Mar 2018 15:31:19 +0000 (+1000)
Subject: Remove observers from monster attack target list and reset their dphitcontentsmask
X-Git-Tag: xonotic-v0.8.5~2257
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=c02da4abce314b5f625a50551e647cf1a61b34e6;p=xonotic%2Fxonotic-data.pk3dir.git

Remove observers from monster attack target list and reset their dphitcontentsmask
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index e898e74e8..238e07fb0 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -308,6 +308,9 @@ void PutObserverInServer(entity this)
 	if(this.bot_attack)
 		IL_REMOVE(g_bot_targets, this);
 	this.bot_attack = false;
+	if(this.monster_attack)
+		IL_REMOVE(g_monster_targets, this);
+	this.monster_attack = false;
     STAT(HUD, this) = HUD_NORMAL;
 	TRANSMUTE(Observer, this);
 	this.iscreature = false;
@@ -340,6 +343,7 @@ void PutObserverInServer(entity this)
 	this.strength_finished = 0;
 	this.invincible_finished = 0;
 	this.superweapons_finished = 0;
+	this.dphitcontentsmask = 0;
 	this.pushltime = 0;
 	this.istypefrag = 0;
 	setthink(this, func_null);