From: terencehill <piuntn@gmail.com>
Date: Sat, 3 Apr 2021 21:18:29 +0000 (+0200)
Subject: When "a CSQC entity changed its type" remove it from all intrusive lists it is on... 
X-Git-Tag: xonotic-v0.8.5~471
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de7b22311242b44746a369e6ff3fdfcedc2ace1e;p=xonotic%2Fxonotic-data.pk3dir.git

When "a CSQC entity changed its type" remove it from all intrusive lists it is on before updating it, possible fix for #2565 "Infinite IntrusiveList in client"
---

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 6978247ab..b6e5a87ed 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -877,6 +877,7 @@ void CSQC_Ent_Update(entity this, bool isnew)
 		{
 			LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)", etof(this), this.entnum, this.enttype, t);
 			Ent_Remove(this);
+			ONREMOVE(this);
 			clearentity(this);
 			isnew = true;
 		}