From 04e1864e0899be3536b945be565e7af2a3eb1ba9 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 15 Aug 2020 15:03:38 +0200
Subject: [PATCH] Fix weapons in coop allowing for infinite selling.

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

diff --git a/language.version b/language.version
index 6a91ed63a..10d85e94b 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \cwGZ\c- r482 (Fri 14 Aug 18:34:08 CEST 2020)";
+SWWM_MODVER="\chSWWM \cwGZ\c- r483 (Sat 15 Aug 15:03:38 CEST 2020)";
diff --git a/zscript/swwm_inventory.zsc b/zscript/swwm_inventory.zsc
index a9f484a01..91585ec6b 100644
--- a/zscript/swwm_inventory.zsc
+++ b/zscript/swwm_inventory.zsc
@@ -979,7 +979,7 @@ Class SWWMWeapon : Weapon abstract
 
 	override bool HandlePickup( Inventory item )
 	{
-		if ( (GetClass() == item.GetClass()) )
+		if ( (GetClass() == item.GetClass()) && !item.ShouldStay() )
 		{
 			int oldammo1 = Ammo1?Ammo1.Amount:0;
 			int oldammo2 = Ammo2?Ammo2.Amount:0;
diff --git a/zscript/swwm_tastytreat.zsc b/zscript/swwm_tastytreat.zsc
index 612026fb3..d05be824f 100644
--- a/zscript/swwm_tastytreat.zsc
+++ b/zscript/swwm_tastytreat.zsc
@@ -857,7 +857,7 @@ Class CandyGun : SWWMWeapon
 	// re-edit to allow picking up spares in coop
 	override bool HandlePickup( Inventory item )
 	{
-		if ( item.GetClass() == GetClass() )
+		if ( (item.GetClass() == GetClass()) && !item.ShouldStay() )
 		{
 			bool ammoget, spareget;
 			[ammoget, spareget] = CandyGun(item).PickupForAmmoAndSpares(self);