From 5a1439762d997d0b28adbd78042c06545908cb80 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 14 Oct 2021 16:39:57 +0200 Subject: [PATCH] Inventory resets weren't accounted for properly in PlayerEntered. --- language.version | 4 ++-- zscript/handler/swwm_handler_playerevents.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index b584a624a..9c072b9e2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.24 \cu(Thu 14 Oct 16:39:40 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.1.24 \cu(2021-10-14 16:39:40)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.25 \cu(Thu 14 Oct 16:41:07 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.1.25 \cu(2021-10-14 16:41:07)\c-"; diff --git a/zscript/handler/swwm_handler_playerevents.zsc b/zscript/handler/swwm_handler_playerevents.zsc index a1ef971fd..551fe8bf1 100644 --- a/zscript/handler/swwm_handler_playerevents.zsc +++ b/zscript/handler/swwm_handler_playerevents.zsc @@ -100,7 +100,7 @@ extend Class SWWMHandler s.GotWeapon(Weapon(i).GetClass()); } } - else if ( (s.lastcluster != level.cluster) || !(level.clusterflags&LevelLocals.CLUSTER_HUB) ) + else if ( (s.lastcluster != level.cluster) || !(level.clusterflags&LevelLocals.CLUSTER_HUB) || (level.removeitems && !e.IsReturn) ) { // clear the "weapon got" lists for weapons we don't have anymore (unless we're in a hub) // so the obtain lines play again