From 088800de9e9afe5778b4cf02cd8f72a314ea7e52 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Mon, 20 Sep 2021 23:22:10 +0200
Subject: [PATCH] Fix Demolitionist still getting poisoned.

---
 language.version        |  4 ++--
 zscript/swwm_player.zsc | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/language.version b/language.version
index b6b5a5762..60f9c2b49 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.6 \cu(Mon 20 Sep 20:08:07 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.1.6 \cu(2021-09-20 20:08:07)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.7 \cu(Mon 20 Sep 23:22:24 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.1.7 \cu(2021-09-20 23:22:24)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 9ceeb309f..5ce2b7336 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -936,9 +936,18 @@ Class Demolitionist : PlayerPawn
 			}
 		}
 	}
+	override void CheckPoison()
+	{
+		// HAHA no
+		player.poisoncount = 0;
+	}
 	override void Tick()
 	{
 		Vector3 oldpos = pos;
+		// can't be poisoned
+		PoisonDurationReceived = 0;
+		PoisonPeriodReceived = 0;
+		PoisonDamageReceived = 0;
 		Super.Tick();
 		if ( hasteleported )
 		{
@@ -946,10 +955,6 @@ Class Demolitionist : PlayerPawn
 			oldpos = pos;
 			hasteleported = false;
 		}
-		// can't be poisoned
-		PoisonDurationReceived = 0;
-		PoisonPeriodReceived = 0;
-		PoisonDamageReceived = 0;
 		if ( !selflight )
 		{
 			selflight = Spawn("DemolitionistSelfLight",pos);