Brought in line with web rework

jonathaneeckhout · Feb 11, 2024 · 32e2788 · 32e2788
1 parent a073a89
commit 32e2788
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/Item.gd b/classes/Item.gd
@@ -102,13 +102,14 @@ func server_use(player: Player) -> bool:
 				player.stats.heal(self.name, boost.hp)
 
 				if amount <= 1:
-					player.inventory.remove_item(uuid)
+					player.inventory.server_remove_item(uuid)
 				else:
-					player.inventory.set_item_amount(uuid, amount - 1)
+					player.inventory.server_change_item_amount(uuid, amount - 1)
 				return true
 
 		ITEM_TYPE.EQUIPMENT:
 			if player.equipment and player.equipment.server_equip_item(self):
+				player.inventory.server_remove_item(uuid)
 				return true
 
 			else:

diff --git a/components/player/inventorysynchronizercomponent/InventorySynchronizerComponent.gd b/components/player/inventorysynchronizercomponent/InventorySynchronizerComponent.gd
@@ -188,7 +188,6 @@ func server_use_item(item_uuid: String):
 
 	var item: Item = get_item(item_uuid)
 	if item and item.server_use(_target_node):
-		server_remove_item(item_uuid)
 		return true
 
 	return false