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

InventoryTransaction::execute() now throws exceptions instead of returning true/false

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-07-01 14:08:28 +01:00
parent 30591d047c
commit cf5e31c619
5 changed files with 83 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/mcpe/handler/InGamePacketHandler.php
View File

@ -33,7 +33,7 @@ use pocketmine\event\player\PlayerEditBookEvent;
use pocketmine\inventory\transaction\action\InventoryAction;
use pocketmine\inventory\transaction\CraftingTransaction;
use pocketmine\inventory\transaction\InventoryTransaction;
use pocketmine\inventory\transaction\TransactionValidationException;
use pocketmine\inventory\transaction\TransactionException;
use pocketmine\item\VanillaItems;
use pocketmine\item\WritableBook;
use pocketmine\item\WrittenBook;
@ -247,9 +247,13 @@ class InGamePacketHandler extends PacketHandler{
try{
$this->session->getInvManager()->onTransactionStart($this->craftingTransaction);
$this->craftingTransaction->execute();
}catch(TransactionValidationException $e){
}catch(TransactionException $e){
$this->session->getLogger()->debug("Failed to execute crafting transaction: " . $e->getMessage());
//TODO: only sync slots that the client tried to change
foreach($this->craftingTransaction->getInventories() as $inventory){
$this->session->getInvManager()->syncContents($inventory);
}
/*
* TODO: HACK!
* we can't resend the contents of the crafting window, so we force the client to close it instead.
@ -280,11 +284,15 @@ class InGamePacketHandler extends PacketHandler{
$this->session->getInvManager()->onTransactionStart($transaction);
try{
$transaction->execute();
}catch(TransactionValidationException $e){
}catch(TransactionException $e){
$logger = $this->session->getLogger();
$logger->debug("Failed to execute inventory transaction: " . $e->getMessage());
$logger->debug("Actions: " . json_encode($data->getActions()));
foreach($transaction->getInventories() as $inventory){
$this->session->getInvManager()->syncContents($inventory);
}
return false;
}
}