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

Merge branch 'legacy/pm4' into stable

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-07-31 11:29:58 +01:00
commit 4c737b2ee3
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/entity/object/ItemEntity.php
View File

@ -123,7 +123,7 @@ class ItemEntity extends Entity{
} }
} }
if($this->hasMovementUpdate() && $this->despawnDelay % self::MERGE_CHECK_PERIOD === 0){ if($this->hasMovementUpdate() && $this->isMergeCandidate() && $this->despawnDelay % self::MERGE_CHECK_PERIOD === 0){
$mergeable = [$this]; //in case the merge target ends up not being this $mergeable = [$this]; //in case the merge target ends up not being this
$mergeTarget = $this; $mergeTarget = $this;
foreach($this->getWorld()->getNearbyEntities($this->boundingBox->expandedCopy(0.5, 0.5, 0.5), $this) as $entity){ foreach($this->getWorld()->getNearbyEntities($this->boundingBox->expandedCopy(0.5, 0.5, 0.5), $this) as $entity){
@ -165,12 +165,19 @@ class ItemEntity extends Entity{
} }
} }
private function isMergeCandidate() : bool{
return $this->pickupDelay !== self::NEVER_DESPAWN && $this->item->getCount() < $this->item->getMaxStackSize();
}
/** /**
* Returns whether this item entity can merge with the given one. * Returns whether this item entity can merge with the given one.
*/ */
public function isMergeable(ItemEntity $entity) : bool{ public function isMergeable(ItemEntity $entity) : bool{
if(!$this->isMergeCandidate() || !$entity->isMergeCandidate()){
return false;
}
$item = $entity->item; $item = $entity->item;
return $entity !== $this && $entity->pickupDelay !== self::NEVER_DESPAWN && $item->canStackWith($this->item) && $item->getCount() + $this->item->getCount() <= $item->getMaxStackSize(); return $entity !== $this && $item->canStackWith($this->item) && $item->getCount() + $this->item->getCount() <= $item->getMaxStackSize();
} }
/** /**