mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +00:00
Code Issues Projects Releases Wiki Activity

Use setUsingItem() instead of directly setting data flags

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-08 18:03:19 +01:00
parent aa91183504
commit 51e4a62e7b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/Player.php
View File

@ -2338,7 +2338,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$type = $packet->trData->actionType;
switch($type){
case InventoryTransactionPacket::USE_ITEM_ACTION_CLICK_BLOCK:
$this->setGenericFlag(self::DATA_FLAG_ACTION, false);
$this->setUsingItem(false);
if(!$this->canInteract($blockVector->add(0.5, 0.5, 0.5), 13) or $this->isSpectator()){
}elseif($this->isCreative()){
@ -2441,8 +2441,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->inventory->setItemInHand($item);
}
$this->setGenericFlag(self::DATA_FLAG_ACTION, true);
$this->startAction = $this->server->getTick();
$this->setUsingItem(true);
return true;
default:
@ -2614,7 +2613,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->inventory->equipItem($packet->hotbarSlot);
$this->setGenericFlag(self::DATA_FLAG_ACTION, false);
$this->setUsingItem(false);
return true;
}
@ -2824,8 +2823,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
return false;
}
$this->startAction = -1;
$this->setGenericFlag(self::DATA_FLAG_ACTION, false);
$this->setUsingItem(false);
return true;
}
@ -2868,7 +2866,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->level->dropItem($this->add(0, 1.3, 0), $item, $motion, 40);
$this->setGenericFlag(self::DATA_FLAG_ACTION, false);
$this->setUsingItem(false);
return true;
}