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

Item: rename onActivate() to onInteractBlock()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-11-09 19:33:13 +00:00
parent 8c480ffab9
commit 6cf875ca3a
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/item/Bucket.php
View File

@ -36,7 +36,7 @@ class Bucket extends Item{
return 16; 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 //TODO: move this to generic placement logic
if($blockClicked instanceof Liquid and $blockClicked->isSource()){ if($blockClicked instanceof Liquid and $blockClicked->isSource()){
$stack = clone $this; $stack = clone $this;

2
src/item/FlintSteel.php
View File

@ -32,7 +32,7 @@ use pocketmine\world\sound\FlintSteelSound;
class FlintSteel extends Tool{ 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){ if($blockReplace->getId() === BlockLegacyIds::AIR){
$world = $player->getWorld(); $world = $player->getWorld();
$world->setBlock($blockReplace->getPos(), VanillaBlocks::FIRE()); $world->setBlock($blockReplace->getPos(), VanillaBlocks::FIRE());

2
src/item/Item.php
View File

@ -500,7 +500,7 @@ class Item implements \JsonSerializable{
/** /**
* Called when a player uses this item on a block. * 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(); return ItemUseResult::NONE();
} }

2
src/item/LiquidBucket.php
View File

@ -52,7 +52,7 @@ class LiquidBucket extends Item{
return 0; 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()){ if(!$blockReplace->canBeReplaced()){
return ItemUseResult::NONE(); return ItemUseResult::NONE();
} }

2
src/item/PaintingItem.php
View File

@ -37,7 +37,7 @@ use function count;
class PaintingItem extends Item{ 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){ if(Facing::axis($face) === Axis::Y){
return ItemUseResult::NONE(); return ItemUseResult::NONE();
} }

2
src/item/SpawnEgg.php
View File

@ -34,7 +34,7 @@ abstract class SpawnEgg extends Item{
abstract protected function createEntity(World $world, Vector3 $pos, float $yaw, float $pitch) : Entity; 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); $entity = $this->createEntity($player->getWorld(), $blockReplace->getPos()->add(0.5, 0, 0.5), lcg_value() * 360, 0);
if($this->hasCustomName()){ if($this->hasCustomName()){

2
src/world/World.php
View File

@ -1618,7 +1618,7 @@ class World implements ChunkManager{
return true; return true;
} }
$result = $item->onActivate($player, $blockReplace, $blockClicked, $face, $clickVector); $result = $item->onInteractBlock($player, $blockReplace, $blockClicked, $face, $clickVector);
if(!$result->equals(ItemUseResult::NONE())){ if(!$result->equals(ItemUseResult::NONE())){
return $result->equals(ItemUseResult::SUCCESS()); return $result->equals(ItemUseResult::SUCCESS());
} }