Merge remote-tracking branch 'upstream/stable' into stable

NetherGamesMC · Apr 8, 2024 · 3ad6272 · 3ad6272
2 parents 5bac0e0 + 50e2c46
commit 3ad6272
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/entity/Living.php b/src/entity/Living.php
@@ -149,24 +149,6 @@ protected function initEntity(CompoundTag $nbt) : void{
 			$this->getViewers(),
 			fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onMobArmorChange($recipients, $this)
 		)));
-		$playArmorSound = function(Item $newItem, Item $oldItem) : void{
-			if(!$newItem->isNull() && $newItem instanceof Armor && !$newItem->equalsExact($oldItem)){
-				$equipSound = $newItem->getMaterial()->getEquipSound();
-				if($equipSound !== null){
-					$this->broadcastSound($equipSound);
-				}
-			}
-		};
-		$this->armorInventory->getListeners()->add(new CallbackInventoryListener(
-			function(Inventory $inventory, int $slot, Item $oldItem) use ($playArmorSound) : void{
-				$playArmorSound($inventory->getItem($slot), $oldItem);
-			},
-			function(Inventory $inventory, array $oldContents) use ($playArmorSound) : void{
-				foreach($oldContents as $slot => $oldItem){
-					$playArmorSound($inventory->getItem($slot), $oldItem);
-				}
-			}
-		));
 
 		$health = $this->getMaxHealth();
 

diff --git a/src/item/Armor.php b/src/item/Armor.php
@@ -146,6 +146,10 @@ public function onClickAir(Player $player, Vector3 $directionVector, array &$ret
 		$new = $thisCopy->pop();
 		$player->getArmorInventory()->setItem($this->getArmorSlot(), $new);
 		$player->getInventory()->setItemInHand($existing);
+		$sound = $new->getMaterial()->getEquipSound();
+		if($sound !== null){
+			$player->broadcastSound($sound);
+		}
 		if(!$thisCopy->isNull()){
 			//if the stack size was bigger than 1 (usually won't happen, but might be caused by plugins)
 			$returnedItems[] = $thisCopy;