From: Mario <mario@smbclan.net>
Date: Thu, 1 Mar 2018 14:29:17 +0000 (+1000)
Subject: Clean up a movetype check in warpzone code
X-Git-Tag: xonotic-v0.8.5~2267
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b4c23c88b36c8c47b88872e318a5b0e9a40c48a;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up a movetype check in warpzone code
---

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 8246e106d..ce4535452 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -177,11 +177,7 @@ void WarpZone_Touch(entity this, entity toucher)
 		return;
 
 	// FIXME needs a better check to know what is safe to teleport and what not
-	if((toucher.move_movetype == MOVETYPE_NONE && toucher.move_movetype == MOVETYPE_NONE) || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.tag_entity
-#ifdef CSQC
-	|| tag_networkentity
-#endif
-	)
+	if(toucher.move_movetype == MOVETYPE_NONE || toucher.move_movetype == MOVETYPE_FOLLOW || toucher.tag_entity)
 		return;
 
 	if(WarpZoneLib_ExactTrigger_Touch(this, toucher))