diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 21cd48b7f..fcb6d9085 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -99,7 +99,6 @@ use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\ListTag; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\network\mcpe\PlayerNetworkSessionAdapter; use pocketmine\network\mcpe\protocol\ActorEventPacket; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; @@ -1114,13 +1113,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } } - protected function sendCompletedUsingItemPacket(int $itemId, int $action){ - $pk = new CompletedUsingItemPacket(); - $pk->itemId = $itemId; - $pk->action = $action; - $this->sendDataPacket($pk); - } - protected function sendRespawnPacket(Vector3 $pos, int $respawnState = RespawnPacket::SEARCHING_FOR_SPAWN){ $pk = new RespawnPacket(); $pk->position = $pos->add(0, $this->baseOffset, 0); @@ -2547,9 +2539,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } $this->setUsingItem(false); - if($item->onUse($this)){ - $this->sendCompletedUsingItemPacket($item->getId(), $item->getCompletedAction()); - } + $item->onUse($this); return true; default: @@ -2667,7 +2657,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ if($item->onReleaseUsing($this)){ $this->resetItemCooldown($item); $this->inventory->setItemInHand($item); - $this->sendCompletedUsingItemPacket($item->getId(), $item->getCompletedAction()); } }else{ break; diff --git a/src/pocketmine/item/Bow.php b/src/pocketmine/item/Bow.php index dbce96828..48428b576 100644 --- a/src/pocketmine/item/Bow.php +++ b/src/pocketmine/item/Bow.php @@ -29,7 +29,6 @@ use pocketmine\entity\projectile\Projectile; use pocketmine\event\entity\EntityShootBowEvent; use pocketmine\event\entity\ProjectileLaunchEvent; use pocketmine\item\enchantment\Enchantment; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\Player; use function intdiv; @@ -48,10 +47,6 @@ class Bow extends Tool{ return 385; } - public function getCompletedAction(){ - return CompletedUsingItemPacket::ACTION_SHOOT; - } - public function onReleaseUsing(Player $player) : bool{ if($player->isSurvival() and !$player->getInventory()->contains(ItemFactory::get(Item::ARROW, 0, 1))){ $player->getInventory()->sendContents($player); diff --git a/src/pocketmine/item/Bucket.php b/src/pocketmine/item/Bucket.php index 89612a438..380b7a9b3 100644 --- a/src/pocketmine/item/Bucket.php +++ b/src/pocketmine/item/Bucket.php @@ -32,7 +32,6 @@ use pocketmine\event\player\PlayerBucketEmptyEvent; use pocketmine\event\player\PlayerBucketFillEvent; use pocketmine\event\player\PlayerItemConsumeEvent; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\Player; class Bucket extends Item implements Consumable{ @@ -117,14 +116,6 @@ class Bucket extends Item implements Consumable{ $consumer->removeAllEffects(); } - public function getCompletedAction(){ - if($this->canBeConsumed()){ - return CompletedUsingItemPacket::ACTION_CONSUME; - }else{ - return CompletedUsingItemPacket::ACTION_POUR_BUCKET; - } - } - public function onUse(Player $player) : bool{ if($this->canBeConsumed()){ $slot = $player->getInventory()->getItemInHand(); diff --git a/src/pocketmine/item/Food.php b/src/pocketmine/item/Food.php index ac1ca4d2e..a97c02822 100644 --- a/src/pocketmine/item/Food.php +++ b/src/pocketmine/item/Food.php @@ -26,7 +26,6 @@ namespace pocketmine\item; use pocketmine\entity\Living; use pocketmine\event\player\PlayerItemConsumeEvent; use pocketmine\math\Vector3; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\Player; abstract class Food extends Item implements FoodSource{ @@ -45,10 +44,6 @@ abstract class Food extends Item implements FoodSource{ return []; } - public function getCompletedAction(){ - return CompletedUsingItemPacket::ACTION_EAT; - } - public function onUse(Player $player) : bool{ $slot = $player->getInventory()->getItemInHand(); diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index bc02fd9f1..16c3df97a 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -41,7 +41,6 @@ use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\NamedTag; use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\StringTag; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\Player; use pocketmine\utils\Binary; use function array_map; @@ -849,10 +848,6 @@ class Item implements ItemIds, \JsonSerializable{ return 0; } - public function getCompletedAction(){ - return CompletedUsingItemPacket::ACTION_UNKNOWN; - } - public function onUse(Player $player) : bool{ return false; } diff --git a/src/pocketmine/item/Potion.php b/src/pocketmine/item/Potion.php index 64a0246c4..0221e50a1 100644 --- a/src/pocketmine/item/Potion.php +++ b/src/pocketmine/item/Potion.php @@ -27,7 +27,6 @@ use pocketmine\entity\Effect; use pocketmine\entity\EffectInstance; use pocketmine\entity\Living; use pocketmine\event\player\PlayerItemConsumeEvent; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\Player; class Potion extends Item implements Consumable{ @@ -239,10 +238,6 @@ class Potion extends Item implements Consumable{ return ItemFactory::get(Item::GLASS_BOTTLE); } - public function getCompletedAction(){ - return CompletedUsingItemPacket::ACTION_CONSUME; - } - public function onUse(Player $player) : bool{ $slot = $player->getInventory()->getItemInHand(); diff --git a/src/pocketmine/item/ProjectileItem.php b/src/pocketmine/item/ProjectileItem.php index 3e824316c..88bebf3e1 100644 --- a/src/pocketmine/item/ProjectileItem.php +++ b/src/pocketmine/item/ProjectileItem.php @@ -29,7 +29,6 @@ use pocketmine\entity\projectile\Projectile; use pocketmine\event\entity\ProjectileLaunchEvent; use pocketmine\math\Vector3; use pocketmine\nbt\tag\CompoundTag; -use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\Player; @@ -48,10 +47,6 @@ abstract class ProjectileItem extends Item{ } - public function getCompletedAction(){ - return CompletedUsingItemPacket::ACTION_THROW; - } - public function onClickAir(Player $player, Vector3 $directionVector) : bool{ $nbt = Entity::createBaseNBT($player->add(0, $player->getEyeHeight(), 0), $directionVector, $player->yaw, $player->pitch); $this->addExtraTags($nbt);