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

BaseInventory: change dumb variable names in internalAddItem()

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-04-27 20:29:02 +01:00
parent 709d874204
commit 4228880509
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/inventory/BaseInventory.php
View File

@ -216,25 +216,25 @@ abstract class BaseInventory implements Inventory{
return $returnSlots;
}
private function internalAddItem(Item $slot) : Item{
private function internalAddItem(Item $newItem) : Item{
$emptySlots = [];
$maxStackSize = min($this->getMaxStackSize(), $slot->getMaxStackSize());
$maxStackSize = min($this->getMaxStackSize(), $newItem->getMaxStackSize());
for($i = 0, $size = $this->getSize(); $i < $size; ++$i){
if($this->isSlotEmpty($i)){
$emptySlots[] = $i;
continue;
}
$item = $this->getItem($i);
$slotItem = $this->getItem($i);
if($slot->canStackWith($item) && $item->getCount() < $maxStackSize){
$amount = min($maxStackSize - $item->getCount(), $slot->getCount());
if($newItem->canStackWith($slotItem) && $slotItem->getCount() < $maxStackSize){
$amount = min($maxStackSize - $slotItem->getCount(), $newItem->getCount());
if($amount > 0){
$slot->setCount($slot->getCount() - $amount);
$item->setCount($item->getCount() + $amount);
$this->setItem($i, $item);
if($slot->getCount() <= 0){
$newItem->setCount($newItem->getCount() - $amount);
$slotItem->setCount($slotItem->getCount() + $amount);
$this->setItem($i, $slotItem);
if($newItem->getCount() <= 0){
break;
}
}
@ -243,18 +243,18 @@ abstract class BaseInventory implements Inventory{
if(count($emptySlots) > 0){
foreach($emptySlots as $slotIndex){
$amount = min($maxStackSize, $slot->getCount());
$slot->setCount($slot->getCount() - $amount);
$item = clone $slot;
$item->setCount($amount);
$this->setItem($slotIndex, $item);
if($slot->getCount() <= 0){
$amount = min($maxStackSize, $newItem->getCount());
$newItem->setCount($newItem->getCount() - $amount);
$slotItem = clone $newItem;
$slotItem->setCount($amount);
$this->setItem($slotIndex, $slotItem);
if($newItem->getCount() <= 0){
break;
}
}
}
return $slot;
return $newItem;
}
public function remove(Item $item) : void{