From f838e7e23ffecdb764ac97e515ae981431519868 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 6 Mar 2021 14:07:23 +0100
Subject: [PATCH] Slight tweak to teleporter handling.

---
 language.version        |  4 ++--
 zscript/swwm_player.zsc | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/language.version b/language.version
index 432ba5c83..edeb85938 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r322 \cu(Sat  6 Mar 10:34:32 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r322 \cu(2021-03-06 10:34:32)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r323 \cu(Sat  6 Mar 14:07:23 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r323 \cu(2021-03-06 14:07:23)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index ce4e4ee17..2046650b1 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -20,6 +20,7 @@ Class Demolitionist : PlayerPawn
 
 	SWWMStats mystats;
 	int cairtime;
+	bool hasteleported;
 
 	int lastmpain;
 
@@ -711,6 +712,12 @@ Class Demolitionist : PlayerPawn
 	{
 		Vector3 oldpos = pos;
 		Super.Tick();
+		if ( hasteleported )
+		{
+			// we just got teleported, don't count the travel distance
+			oldpos = pos;
+			hasteleported = false;
+		}
 		// can't be poisoned
 		PoisonDurationReceived = 0;
 		PoisonPeriodReceived = 0;
@@ -2251,16 +2258,8 @@ Class Demolitionist : PlayerPawn
 	}
 	override void PostTeleport( Vector3 destpos, double destangle, int flags )
 	{
-		// subtract travel distance from the stats, and add it to a separate stat
-		double traveldist = level.Vec3Diff(pretelepos,pos).length();
-		if ( waterlevel < 2 )
-		{
-			if ( !player.onground || bNoGravity )
-				mystats.airdist -= traveldist;
-			else mystats.grounddist -= traveldist;
-		}
-		else mystats.swimdist -= traveldist;
-		mystats.teledist += traveldist;
+		hasteleported = true;	// notify tick that we teleported, so it ignores the travel distance
+		mystats.teledist += level.Vec3Diff(pretelepos,pos).length();
 		// reset all smooth bob variables if angles/velocity aren't carried over
 		if ( !(flags&TELF_KEEPORIENTATION) )
 		{
@@ -2268,7 +2267,10 @@ Class Demolitionist : PlayerPawn
 			oldlagpitch = lagpitch = oldpitch = pitch;
 		}
 		if ( !(flags&TELF_KEEPVELOCITY) )
+		{
 			oldlagvel = lagvel = vel;
+			lastvelz = vel.z;
+		}
 		// notify carried lamp that we just moved
 		let l = SWWMLamp(FindInventory("SWWMLamp"));
 		if ( l && l.thelamp )