From: Mario <mario@smbclan.net>
Date: Thu, 24 Mar 2016 17:32:06 +0000 (+1000)
Subject: Fix teleporters resetting player's view when inside a vehicle despite not teleporting
X-Git-Tag: xonotic-v0.8.2~1027
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bcd035823269696fc210ea5bb0a026d13c795c77;p=xonotic%2Fxonotic-data.pk3dir.git

Fix teleporters resetting player's view when inside a vehicle despite not teleporting
---

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index 4f15d6212..7444a5ded 100644
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -873,7 +873,7 @@ void WarpZone_StartFrame()
 		if(warpzone_warpzones_exist)
 			WarpZone_StoreProjectileData(it);
 
-		if((IS_OBSERVER(it) || it.solid == SOLID_NOT))
+		if(IS_OBSERVER(it) || it.solid == SOLID_NOT)
 		if(IS_CLIENT(it)) // we don't care about it being a bot
 		{
 			other = it; // player
@@ -888,10 +888,13 @@ void WarpZone_StartFrame()
 			}
 
 			// teleporters
-			setself(Teleport_Find(it.origin + it.mins, it.origin + it.maxs));
-			if (self)
-			if (!WarpZoneLib_ExactTrigger_Touch())
-				Simple_TeleportPlayer(self, other); // NOT triggering targets by this!
+			if(other.teleportable)
+			{
+				setself(Teleport_Find(it.origin + it.mins, it.origin + it.maxs));
+				if (self)
+				if (!WarpZoneLib_ExactTrigger_Touch())
+					Simple_TeleportPlayer(self, other); // NOT triggering targets by this!
+			}
 		}
 	});
 	setself(this);