From 15d127baeaf7462e31189e42ce259d99f9ea89bf Mon Sep 17 00:00:00 2001 From: VCraftMCPE Date: Fri, 18 Aug 2017 23:28:24 +0300 Subject: [PATCH 1/3] Update EventListener.php --- ServerAuth/src/ServerAuth/EventListener.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ServerAuth/src/ServerAuth/EventListener.php b/ServerAuth/src/ServerAuth/EventListener.php index fb2288e..13c4698 100644 --- a/ServerAuth/src/ServerAuth/EventListener.php +++ b/ServerAuth/src/ServerAuth/EventListener.php @@ -11,6 +11,7 @@ namespace ServerAuth; +use pocketmine\event\inventory\InventoryTransactionEvent; use pocketmine\event\block\BlockBreakEvent; use pocketmine\event\Listener; use pocketmine\event\entity\EntityDamageEvent; @@ -169,7 +170,14 @@ public function onDropItem(PlayerDropItemEvent $event){ } } } - + public function onTransaction(InventoryTransactionEvent $event){ + $transactions = $event->getTransaction()->getTransactions(); + foreach($transactions as $transaction){ + if($transaction->getInventory()->getHolder() instanceof Player and !ServerAuth::getAPI()->isPlayerAuthenticated($transaction->getInventory()->getHolder())){ + $event->setCancelled(); + } + } + } public function onItemConsume(PlayerItemConsumeEvent $event){ if($this->plugin->getConfig()->getAll()["block-all-events"]){ if(!ServerAuth::getAPI()->isPlayerAuthenticated($event->getPlayer())){ From 4c70828b43f9aad3ffc822121143dfb950a0cd88 Mon Sep 17 00:00:00 2001 From: VCraftMCPE Date: Fri, 18 Aug 2017 23:34:28 +0300 Subject: [PATCH 2/3] Update EventListener.php --- ServerAuth/src/ServerAuth/EventListener.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ServerAuth/src/ServerAuth/EventListener.php b/ServerAuth/src/ServerAuth/EventListener.php index 13c4698..0bb6d30 100644 --- a/ServerAuth/src/ServerAuth/EventListener.php +++ b/ServerAuth/src/ServerAuth/EventListener.php @@ -171,12 +171,14 @@ public function onDropItem(PlayerDropItemEvent $event){ } } public function onTransaction(InventoryTransactionEvent $event){ - $transactions = $event->getTransaction()->getTransactions(); - foreach($transactions as $transaction){ - if($transaction->getInventory()->getHolder() instanceof Player and !ServerAuth::getAPI()->isPlayerAuthenticated($transaction->getInventory()->getHolder())){ + if ($this->plugin->getConfig()->getAll()["block-all-events"]) { + $transactions = $event->getTransaction()->getTransactions(); + foreach($transactions as $transaction){ + if($transaction->getInventory()->getHolder() instanceof Player and !ServerAuth::getAPI()->isPlayerAuthenticated($transaction->getInventory()->getHolder())){ $event->setCancelled(); } } + } } public function onItemConsume(PlayerItemConsumeEvent $event){ if($this->plugin->getConfig()->getAll()["block-all-events"]){ From 80367dd2d663b328ea1f83baed4405177e455746 Mon Sep 17 00:00:00 2001 From: VCraftMCPE Date: Sat, 19 Aug 2017 02:56:19 +0300 Subject: [PATCH 3/3] Update EventListener.php --- ServerAuth/src/ServerAuth/EventListener.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ServerAuth/src/ServerAuth/EventListener.php b/ServerAuth/src/ServerAuth/EventListener.php index 0bb6d30..33262f5 100644 --- a/ServerAuth/src/ServerAuth/EventListener.php +++ b/ServerAuth/src/ServerAuth/EventListener.php @@ -11,6 +11,7 @@ namespace ServerAuth; +use pocketmine\inventory\PlayerInventory; use pocketmine\event\inventory\InventoryTransactionEvent; use pocketmine\event\block\BlockBreakEvent; use pocketmine\event\Listener; @@ -174,10 +175,14 @@ public function onTransaction(InventoryTransactionEvent $event){ if ($this->plugin->getConfig()->getAll()["block-all-events"]) { $transactions = $event->getTransaction()->getTransactions(); foreach($transactions as $transaction){ - if($transaction->getInventory()->getHolder() instanceof Player and !ServerAuth::getAPI()->isPlayerAuthenticated($transaction->getInventory()->getHolder())){ - $event->setCancelled(); + if($transaction->getInventory() instanceof PlayerInventory){ + if($transaction->getInventory()->getHolder() instanceof Player){ + if(!ServerAuth::getAPI()->isPlayerAuthenticated($transaction->getInventory()->getHolder())){ + $event->setCancelled(); + } } } + } } } public function onItemConsume(PlayerItemConsumeEvent $event){