mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-14 07:25:31 +00:00
Code Issues Projects Releases Wiki Activity

Player: check if the item meaningfully changed before discarding it in creative

Browse Source 
fixes #5220
This commit is contained in:
Dylan K. Taylor 2022-10-11 22:06:03 +01:00
parent 1c6a2b66f7
commit db7cee6f22
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/player/Player.php
View File

@ -1473,15 +1473,27 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
*/ */
private function returnItemsFromAction(Item $oldHeldItem, Item $newHeldItem, array $extraReturnedItems) : void{ private function returnItemsFromAction(Item $oldHeldItem, Item $newHeldItem, array $extraReturnedItems) : void{
$heldItemChanged = false; $heldItemChanged = false;
if($this->hasFiniteResources()){
if(!$newHeldItem->equalsExact($oldHeldItem) && $oldHeldItem->equalsExact($this->inventory->getItemInHand())){ if(!$newHeldItem->equalsExact($oldHeldItem) && $oldHeldItem->equalsExact($this->inventory->getItemInHand())){
//determine if the item was changed in some meaningful way, or just damaged/changed count
//if it was really changed we always need to set it, whether we have finite resources or not
$newReplica = clone $oldHeldItem;
$newReplica->setCount($newHeldItem->getCount());
if($newReplica instanceof Durable && $newHeldItem instanceof Durable){
$newReplica->setDamage($newHeldItem->getDamage());
}
$damagedOrDeducted = $newReplica->equalsExact($newHeldItem);
if(!$damagedOrDeducted || $this->hasFiniteResources()){
if($newHeldItem instanceof Durable && $newHeldItem->isBroken()){ if($newHeldItem instanceof Durable && $newHeldItem->isBroken()){
$this->broadcastSound(new ItemBreakSound()); $this->broadcastSound(new ItemBreakSound());
} }
$this->inventory->setItemInHand($newHeldItem); $this->inventory->setItemInHand($newHeldItem);
$heldItemChanged = true; $heldItemChanged = true;
} }
}else{ }
if(!$heldItemChanged){
$newHeldItem = $oldHeldItem; $newHeldItem = $oldHeldItem;
} }