Merge commit '2dc3cf816'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-03 12:52:42 +01:00
commit 5b0964cec8

View File

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