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

Handle exception for crafting and resend inventories

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-12 19:11:57 +01:00
parent 83fcec3e94
commit 5a4fbc6f5a
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pocketmine/Player.php
View File

@ -2149,6 +2149,16 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return true; return true;
} }
protected function sendAllInventories(){
foreach($this->windowIndex as $id => $inventory){
$inventory->sendContents($this);
if($inventory instanceof PlayerInventory){
$inventory->sendArmorContents($this);
$inventory->sendHotbar();
}
}
}
/** /**
* Don't expect much from this handler. Most of it is roughly hacked and duct-taped together. * Don't expect much from this handler. Most of it is roughly hacked and duct-taped together.
* *
@ -2161,7 +2171,13 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$transaction = new SimpleInventoryTransaction($this); $transaction = new SimpleInventoryTransaction($this);
foreach($packet->actions as $action){ foreach($packet->actions as $action){
$transaction->addAction($action); try{
$transaction->addAction($action);
}catch(\InvalidStateException $e){
$this->server->getLogger()->debug($e->getMessage());
$this->sendAllInventories();
return false;
}
} }
if(!$transaction->execute()){ if(!$transaction->execute()){
@ -2183,13 +2199,8 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
if(count($packet->actions) > 0){ if(count($packet->actions) > 0){
$this->server->getLogger()->debug("Expected 0 actions for mismatch, got " . count($packet->actions) . ", " . json_encode($packet->actions)); $this->server->getLogger()->debug("Expected 0 actions for mismatch, got " . count($packet->actions) . ", " . json_encode($packet->actions));
} }
foreach($this->windowIndex as $id => $inventory){ $this->sendAllInventories();
$inventory->sendContents($this);
if($inventory instanceof PlayerInventory){
$inventory->sendArmorContents($this);
}
}
$this->inventory->sendHotbar();
return true; return true;
case InventoryTransactionPacket::TYPE_USE_ITEM: case InventoryTransactionPacket::TYPE_USE_ITEM:
$blockVector = new Vector3($packet->transactionData->x, $packet->transactionData->y, $packet->transactionData->z); $blockVector = new Vector3($packet->transactionData->x, $packet->transactionData->y, $packet->transactionData->z);