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

Player: Moved logic of setUsingItem()

Browse Source 
plugins might be using this method, or the item may have been dropped involuntarily due to server-side logic. Therefore it should be handled when the transaction is received and not when the item is dropped into the world.
This commit is contained in:
Dylan K. Taylor 2018-01-22 18:36:48 +00:00
parent 4943ff9dfc
commit 897a31e608
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/Player.php
View File

@ -2247,6 +2247,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
switch($packet->transactionType){ switch($packet->transactionType){
case InventoryTransactionPacket::TYPE_NORMAL: case InventoryTransactionPacket::TYPE_NORMAL:
$this->setUsingItem(false);
$transaction = new InventoryTransaction($this, $actions); $transaction = new InventoryTransaction($this, $actions);
if(!$transaction->execute()){ if(!$transaction->execute()){
@ -2262,6 +2263,7 @@ 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));
} }
$this->setUsingItem(false);
$this->sendAllInventories(); $this->sendAllInventories();
return true; return true;
@ -2767,8 +2769,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->level->dropItem($this->add(0, 1.3, 0), $item, $motion, 40); $this->level->dropItem($this->add(0, 1.3, 0), $item, $motion, 40);
$this->setUsingItem(false);
return true; return true;
} }