mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next-minor' into next-major

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-08-21 19:19:07 +01:00
parent 6e8f11d5e8 5d5366a7c8
commit 1ecb10acba
30 changed files with 350 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/player/Player.php
View File

@ -86,7 +86,7 @@ use pocketmine\inventory\PlayerCursorInventory;
use pocketmine\inventory\TemporaryInventory;
use pocketmine\inventory\transaction\action\DropItemAction;
use pocketmine\inventory\transaction\InventoryTransaction;
use pocketmine\inventory\transaction\TransactionBuilderInventory;
use pocketmine\inventory\transaction\TransactionBuilder;
use pocketmine\inventory\transaction\TransactionCancelledException;
use pocketmine\inventory\transaction\TransactionValidationException;
use pocketmine\item\ConsumableItem;
@ -1583,7 +1583,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$ev = new PlayerBlockPickEvent($this, $block, $item);
$existingSlot = $this->inventory->first($item);
if($existingSlot === -1 && $this->hasFiniteResources()){
if($existingSlot === -1 && ($this->hasFiniteResources() || $this->isSpectator())){
$ev->cancel();
}
$ev->call();
@ -2444,29 +2444,23 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$inventories[] = $this->currentWindow;
}
$transaction = new InventoryTransaction($this);
$mainInventoryTransactionBuilder = new TransactionBuilderInventory($this->inventory);
$builder = new TransactionBuilder();
foreach($inventories as $inventory){
$contents = $inventory->getContents();
if(count($contents) > 0){
$drops = $mainInventoryTransactionBuilder->addItem(...$contents);
$drops = $builder->getInventory($this->inventory)->addItem(...$contents);
foreach($drops as $drop){
$transaction->addAction(new DropItemAction($drop));
$builder->addAction(new DropItemAction($drop));
}
$clearedInventoryTransactionBuilder = new TransactionBuilderInventory($inventory);
$clearedInventoryTransactionBuilder->clearAll();
foreach($clearedInventoryTransactionBuilder->generateActions() as $action){
$transaction->addAction($action);
}
$builder->getInventory($inventory)->clearAll();
}
}
foreach($mainInventoryTransactionBuilder->generateActions() as $action){
$transaction->addAction($action);
}
if(count($transaction->getActions()) !== 0){
$actions = $builder->generateActions();
if(count($actions) !== 0){
$transaction = new InventoryTransaction($this, $actions);
try{
$transaction->execute();
$this->logger->debug("Successfully evacuated items from temporary inventories");