CompletedUsingItemPacket is superfluous

This commit is contained in:
Dylan K. Taylor 2019-11-08 08:29:25 +00:00
parent 6a31628e78
commit d2e4eb40b3
7 changed files with 1 additions and 46 deletions

View File

@ -99,7 +99,6 @@ use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\DoubleTag;
use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ListTag;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\network\mcpe\PlayerNetworkSessionAdapter; use pocketmine\network\mcpe\PlayerNetworkSessionAdapter;
use pocketmine\network\mcpe\protocol\ActorEventPacket; use pocketmine\network\mcpe\protocol\ActorEventPacket;
use pocketmine\network\mcpe\protocol\AdventureSettingsPacket; 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){ protected function sendRespawnPacket(Vector3 $pos, int $respawnState = RespawnPacket::SEARCHING_FOR_SPAWN){
$pk = new RespawnPacket(); $pk = new RespawnPacket();
$pk->position = $pos->add(0, $this->baseOffset, 0); $pk->position = $pos->add(0, $this->baseOffset, 0);
@ -2547,9 +2539,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
} }
$this->setUsingItem(false); $this->setUsingItem(false);
if($item->onUse($this)){ $item->onUse($this);
$this->sendCompletedUsingItemPacket($item->getId(), $item->getCompletedAction());
}
return true; return true;
default: default:
@ -2667,7 +2657,6 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
if($item->onReleaseUsing($this)){ if($item->onReleaseUsing($this)){
$this->resetItemCooldown($item); $this->resetItemCooldown($item);
$this->inventory->setItemInHand($item); $this->inventory->setItemInHand($item);
$this->sendCompletedUsingItemPacket($item->getId(), $item->getCompletedAction());
} }
}else{ }else{
break; break;

View File

@ -29,7 +29,6 @@ use pocketmine\entity\projectile\Projectile;
use pocketmine\event\entity\EntityShootBowEvent; use pocketmine\event\entity\EntityShootBowEvent;
use pocketmine\event\entity\ProjectileLaunchEvent; use pocketmine\event\entity\ProjectileLaunchEvent;
use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\Enchantment;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\Player; use pocketmine\Player;
use function intdiv; use function intdiv;
@ -48,10 +47,6 @@ class Bow extends Tool{
return 385; return 385;
} }
public function getCompletedAction(){
return CompletedUsingItemPacket::ACTION_SHOOT;
}
public function onReleaseUsing(Player $player) : bool{ public function onReleaseUsing(Player $player) : bool{
if($player->isSurvival() and !$player->getInventory()->contains(ItemFactory::get(Item::ARROW, 0, 1))){ if($player->isSurvival() and !$player->getInventory()->contains(ItemFactory::get(Item::ARROW, 0, 1))){
$player->getInventory()->sendContents($player); $player->getInventory()->sendContents($player);

View File

@ -32,7 +32,6 @@ use pocketmine\event\player\PlayerBucketEmptyEvent;
use pocketmine\event\player\PlayerBucketFillEvent; use pocketmine\event\player\PlayerBucketFillEvent;
use pocketmine\event\player\PlayerItemConsumeEvent; use pocketmine\event\player\PlayerItemConsumeEvent;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\Player; use pocketmine\Player;
class Bucket extends Item implements Consumable{ class Bucket extends Item implements Consumable{
@ -117,14 +116,6 @@ class Bucket extends Item implements Consumable{
$consumer->removeAllEffects(); $consumer->removeAllEffects();
} }
public function getCompletedAction(){
if($this->canBeConsumed()){
return CompletedUsingItemPacket::ACTION_CONSUME;
}else{
return CompletedUsingItemPacket::ACTION_POUR_BUCKET;
}
}
public function onUse(Player $player) : bool{ public function onUse(Player $player) : bool{
if($this->canBeConsumed()){ if($this->canBeConsumed()){
$slot = $player->getInventory()->getItemInHand(); $slot = $player->getInventory()->getItemInHand();

View File

@ -26,7 +26,6 @@ namespace pocketmine\item;
use pocketmine\entity\Living; use pocketmine\entity\Living;
use pocketmine\event\player\PlayerItemConsumeEvent; use pocketmine\event\player\PlayerItemConsumeEvent;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\Player; use pocketmine\Player;
abstract class Food extends Item implements FoodSource{ abstract class Food extends Item implements FoodSource{
@ -45,10 +44,6 @@ abstract class Food extends Item implements FoodSource{
return []; return [];
} }
public function getCompletedAction(){
return CompletedUsingItemPacket::ACTION_EAT;
}
public function onUse(Player $player) : bool{ public function onUse(Player $player) : bool{
$slot = $player->getInventory()->getItemInHand(); $slot = $player->getInventory()->getItemInHand();

View File

@ -41,7 +41,6 @@ use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\NamedTag; use pocketmine\nbt\tag\NamedTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
use function array_map; use function array_map;
@ -849,10 +848,6 @@ class Item implements ItemIds, \JsonSerializable{
return 0; return 0;
} }
public function getCompletedAction(){
return CompletedUsingItemPacket::ACTION_UNKNOWN;
}
public function onUse(Player $player) : bool{ public function onUse(Player $player) : bool{
return false; return false;
} }

View File

@ -27,7 +27,6 @@ use pocketmine\entity\Effect;
use pocketmine\entity\EffectInstance; use pocketmine\entity\EffectInstance;
use pocketmine\entity\Living; use pocketmine\entity\Living;
use pocketmine\event\player\PlayerItemConsumeEvent; use pocketmine\event\player\PlayerItemConsumeEvent;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\Player; use pocketmine\Player;
class Potion extends Item implements Consumable{ class Potion extends Item implements Consumable{
@ -239,10 +238,6 @@ class Potion extends Item implements Consumable{
return ItemFactory::get(Item::GLASS_BOTTLE); return ItemFactory::get(Item::GLASS_BOTTLE);
} }
public function getCompletedAction(){
return CompletedUsingItemPacket::ACTION_CONSUME;
}
public function onUse(Player $player) : bool{ public function onUse(Player $player) : bool{
$slot = $player->getInventory()->getItemInHand(); $slot = $player->getInventory()->getItemInHand();

View File

@ -29,7 +29,6 @@ use pocketmine\entity\projectile\Projectile;
use pocketmine\event\entity\ProjectileLaunchEvent; use pocketmine\event\entity\ProjectileLaunchEvent;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\CompletedUsingItemPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\Player; 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{ public function onClickAir(Player $player, Vector3 $directionVector) : bool{
$nbt = Entity::createBaseNBT($player->add(0, $player->getEyeHeight(), 0), $directionVector, $player->yaw, $player->pitch); $nbt = Entity::createBaseNBT($player->add(0, $player->getEyeHeight(), 0), $directionVector, $player->yaw, $player->pitch);
$this->addExtraTags($nbt); $this->addExtraTags($nbt);