From 5fa179708fbe95df854d5577b7785afadf8a1f90 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 20 Aug 2021 21:20:07 +0200
Subject: [PATCH] Fix key sharing in coop.

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

diff --git a/language.version b/language.version
index dac2403ad..23233072b 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw1.0.6 \cu(Fri 20 Aug 11:22:12 CEST 2021)\c-";
-SWWM_SHORTVER="\cw1.0.6 \cu(2021-08-20 11:22:12)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw1.0.5 r1 \cu(Fri 20 Aug 21:20:07 CEST 2021)\c-";
+SWWM_SHORTVER="\cw1.0.5 r1 \cu(2021-08-20 21:20:07)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 9c62451ef..f5722d522 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -2518,6 +2518,7 @@ Class Demolitionist : PlayerPawn
 					nk.AttachToOwner(whom);
 					nk.Use(true);
 				}
+				Super.AddInventory(item);
 				return;
 			}
 		}
@@ -2548,7 +2549,7 @@ Class Demolitionist : PlayerPawn
 				let tkey = Inventory(Spawn(item.GetClass()));
 				SWWMHandler.KeyTagFix(tkey);
 				if ( tkey is 'SWWMKey' ) SWWMKey(tkey).propagated = true;	// no anim
-				if ( !tkey.CallTryPickup(self) ) tkey.Destroy();
+				if ( !tkey.CallTryPickup(players[i].mo) ) tkey.Destroy();
 				if ( players[i].mo is 'Demolitionist' ) Demolitionist(players[i].mo).key_reentrant = false;
 			}
 		}