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

Merge branch 'stable' into next-minor

Browse Source 
# Conflicts:
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php
This commit is contained in:
Dylan K. Taylor
2020-06-01 13:42:59 +01:00
parent 484557935e 92cffc00d0
commit f24be2b055
15 changed files with 93 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/inventory/transaction/InventoryTransaction.php
View File

@@ -293,7 +293,12 @@ class InventoryTransaction{
$this->shuffleActions();
$this->validate();
try{
$this->validate();
}catch(TransactionValidationException $e){
$this->sendInventories();
throw $e;
}
if(!$this->callExecuteEvent()){
$this->sendInventories();