diff --git a/src/item/Bucket.php b/src/item/Bucket.php index 649c45a2b..2cf0ac55f 100644 --- a/src/item/Bucket.php +++ b/src/item/Bucket.php @@ -36,7 +36,7 @@ class Bucket extends Item{ return 16; } - public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ + public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ //TODO: move this to generic placement logic if($blockClicked instanceof Liquid and $blockClicked->isSource()){ $stack = clone $this; diff --git a/src/item/FlintSteel.php b/src/item/FlintSteel.php index 0ddac5cc2..d5088e641 100644 --- a/src/item/FlintSteel.php +++ b/src/item/FlintSteel.php @@ -32,7 +32,7 @@ use pocketmine\world\sound\FlintSteelSound; class FlintSteel extends Tool{ - public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ + public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ if($blockReplace->getId() === BlockLegacyIds::AIR){ $world = $player->getWorld(); $world->setBlock($blockReplace->getPos(), VanillaBlocks::FIRE()); diff --git a/src/item/Item.php b/src/item/Item.php index 14c10a570..7e559c4db 100644 --- a/src/item/Item.php +++ b/src/item/Item.php @@ -500,7 +500,7 @@ class Item implements \JsonSerializable{ /** * Called when a player uses this item on a block. */ - public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ + public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ return ItemUseResult::NONE(); } diff --git a/src/item/LiquidBucket.php b/src/item/LiquidBucket.php index 88fe7663f..dfaa2172d 100644 --- a/src/item/LiquidBucket.php +++ b/src/item/LiquidBucket.php @@ -52,7 +52,7 @@ class LiquidBucket extends Item{ return 0; } - public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ + public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ if(!$blockReplace->canBeReplaced()){ return ItemUseResult::NONE(); } diff --git a/src/item/PaintingItem.php b/src/item/PaintingItem.php index 5bbac2d7b..d640e061e 100644 --- a/src/item/PaintingItem.php +++ b/src/item/PaintingItem.php @@ -37,7 +37,7 @@ use function count; class PaintingItem extends Item{ - public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ + public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ if(Facing::axis($face) === Axis::Y){ return ItemUseResult::NONE(); } diff --git a/src/item/SpawnEgg.php b/src/item/SpawnEgg.php index 9748bfe72..e41e3997d 100644 --- a/src/item/SpawnEgg.php +++ b/src/item/SpawnEgg.php @@ -34,7 +34,7 @@ abstract class SpawnEgg extends Item{ abstract protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity; - public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ + public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : ItemUseResult{ $entity = $this->createEntity($player->getWorld(), $blockReplace->getPos()->add(0.5, 0, 0.5), lcg_value() * 360, 0); if($this->hasCustomName()){ diff --git a/src/world/World.php b/src/world/World.php index 4d15d8a1e..4a2e2f78f 100644 --- a/src/world/World.php +++ b/src/world/World.php @@ -1618,7 +1618,7 @@ class World implements ChunkManager{ return true; } - $result = $item->onActivate($player, $blockReplace, $blockClicked, $face, $clickVector); + $result = $item->onInteractBlock($player, $blockReplace, $blockClicked, $face, $clickVector); if(!$result->equals(ItemUseResult::NONE())){ return $result->equals(ItemUseResult::SUCCESS()); }