From 8507ffd0cfd5f44f48f7fee573641eb98718cab6 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 27 Jun 2011 19:12:05 +0200
Subject: [PATCH] fix a case of repeated teleporting

---
 qcsrc/warpzonelib/server.qc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 476b4ca20..50cb953af 100644
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -289,7 +289,10 @@ float WarpZone_CheckProjectileImpact(entity player)
 
 	o0 = player.origin + player.view_ofs;
 	v0 = player.velocity;
-	a0 = player.angles;
+
+	// if we teleported shortly before, abort
+	if(time < player.warpzone_teleport_time + 0.1)
+		return 0;
 
 	// if player hit a warpzone, abort
 	entity wz;
@@ -328,7 +331,7 @@ float WarpZone_CheckProjectileImpact(entity player)
 	}
 	else
 	{
-		setorigin(player, o0);
+		setorigin(player, o0 - player.view_ofs);
 		player.velocity = v0;
 	}
 
-- 
2.39.2