From 6ae24c5c19ec59dbb79e92609a48764ede77d73f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 22 Feb 2017 11:48:58 +0000 Subject: [PATCH] Removed unnecessary methods Block->canBeActivated() and Item->canBeActivated() (needless extra confusion) --- src/pocketmine/block/Anvil.php | 4 ---- src/pocketmine/block/Bed.php | 4 ---- src/pocketmine/block/Block.php | 9 --------- src/pocketmine/block/BurningFurnace.php | 4 ---- src/pocketmine/block/Cake.php | 4 ---- src/pocketmine/block/Chest.php | 4 ---- src/pocketmine/block/Crops.php | 4 ---- src/pocketmine/block/Dirt.php | 4 ---- src/pocketmine/block/Door.php | 4 ---- src/pocketmine/block/EnchantingTable.php | 4 ---- src/pocketmine/block/FenceGate.php | 4 ---- src/pocketmine/block/FlowerPot.php | 4 ---- src/pocketmine/block/Grass.php | 4 ---- src/pocketmine/block/ItemFrame.php | 4 ---- src/pocketmine/block/Sapling.php | 4 ---- src/pocketmine/block/TNT.php | 4 ---- src/pocketmine/block/Trapdoor.php | 4 ---- src/pocketmine/block/WoodDoor.php | 4 ---- src/pocketmine/block/Workbench.php | 4 ---- src/pocketmine/item/Bucket.php | 4 ---- src/pocketmine/item/FlintSteel.php | 4 ---- src/pocketmine/item/Item.php | 4 ---- src/pocketmine/item/Painting.php | 4 ---- src/pocketmine/item/SpawnEgg.php | 4 ---- src/pocketmine/level/Level.php | 6 +++--- 25 files changed, 3 insertions(+), 104 deletions(-) diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index 70eae6e8f..28e349769 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -44,10 +44,6 @@ class Anvil extends Fallable{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 5; } diff --git a/src/pocketmine/block/Bed.php b/src/pocketmine/block/Bed.php index 606d34c35..ddb31ae76 100644 --- a/src/pocketmine/block/Bed.php +++ b/src/pocketmine/block/Bed.php @@ -38,10 +38,6 @@ class Bed extends Transparent{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 0.2; } diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index e9c85ff60..b109684d9 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -472,15 +472,6 @@ class Block extends Position implements BlockIds, Metadatable{ return false; } - /** - * AKA: Block->isActivable - * - * @return bool - */ - public function canBeActivated(){ - return false; - } - public function hasEntityCollision(){ return false; } diff --git a/src/pocketmine/block/BurningFurnace.php b/src/pocketmine/block/BurningFurnace.php index 2c9f2eed4..e3075b049 100644 --- a/src/pocketmine/block/BurningFurnace.php +++ b/src/pocketmine/block/BurningFurnace.php @@ -46,10 +46,6 @@ class BurningFurnace extends Solid{ return "Burning Furnace"; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 3.5; } diff --git a/src/pocketmine/block/Cake.php b/src/pocketmine/block/Cake.php index 3b43dbae7..fb508e21b 100644 --- a/src/pocketmine/block/Cake.php +++ b/src/pocketmine/block/Cake.php @@ -39,10 +39,6 @@ class Cake extends Transparent implements FoodSource{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 0.5; } diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php index 24db4af0a..da5b512b5 100644 --- a/src/pocketmine/block/Chest.php +++ b/src/pocketmine/block/Chest.php @@ -43,10 +43,6 @@ class Chest extends Transparent{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 2.5; } diff --git a/src/pocketmine/block/Crops.php b/src/pocketmine/block/Crops.php index a5a389b7e..e6bfd3068 100644 --- a/src/pocketmine/block/Crops.php +++ b/src/pocketmine/block/Crops.php @@ -32,10 +32,6 @@ use pocketmine\Server; abstract class Crops extends Flowable{ - public function canBeActivated(){ - return true; - } - public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ if($block->getSide(Vector3::SIDE_DOWN)->getId() === Block::FARMLAND){ $this->getLevel()->setBlock($block, $this, true, true); diff --git a/src/pocketmine/block/Dirt.php b/src/pocketmine/block/Dirt.php index 5acc8e3e2..a6c14ff57 100644 --- a/src/pocketmine/block/Dirt.php +++ b/src/pocketmine/block/Dirt.php @@ -35,10 +35,6 @@ class Dirt extends Solid{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 0.5; } diff --git a/src/pocketmine/block/Door.php b/src/pocketmine/block/Door.php index 2357e26a3..053d4a457 100644 --- a/src/pocketmine/block/Door.php +++ b/src/pocketmine/block/Door.php @@ -33,10 +33,6 @@ use pocketmine\Player; abstract class Door extends Transparent{ - public function canBeActivated(){ - return true; - } - public function isSolid(){ return false; } diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php index b24a60a61..df2d6aa60 100644 --- a/src/pocketmine/block/EnchantingTable.php +++ b/src/pocketmine/block/EnchantingTable.php @@ -64,10 +64,6 @@ class EnchantingTable extends Transparent{ return true; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 5; } diff --git a/src/pocketmine/block/FenceGate.php b/src/pocketmine/block/FenceGate.php index 3d39d8fd8..5283c9631 100644 --- a/src/pocketmine/block/FenceGate.php +++ b/src/pocketmine/block/FenceGate.php @@ -45,10 +45,6 @@ class FenceGate extends Transparent{ return 2; } - public function canBeActivated(){ - return true; - } - public function getToolType(){ return Tool::TYPE_AXE; } diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php index 74a5c2164..aa04ea545 100644 --- a/src/pocketmine/block/FlowerPot.php +++ b/src/pocketmine/block/FlowerPot.php @@ -50,10 +50,6 @@ class FlowerPot extends Flowable{ return "Flower Pot Block"; } - public function canBeActivated(): bool{ - return true; - } - protected function recalculateBoundingBox(){ return new AxisAlignedBB( $this->x + 0.3125, diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php index 8270b42e8..74ab1b5b9 100644 --- a/src/pocketmine/block/Grass.php +++ b/src/pocketmine/block/Grass.php @@ -41,10 +41,6 @@ class Grass extends Solid{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getName(){ return "Grass"; } diff --git a/src/pocketmine/block/ItemFrame.php b/src/pocketmine/block/ItemFrame.php index e5e506ea6..940bf897f 100644 --- a/src/pocketmine/block/ItemFrame.php +++ b/src/pocketmine/block/ItemFrame.php @@ -43,10 +43,6 @@ class ItemFrame extends Flowable{ return "Item Frame"; } - public function canBeActivated(){ - return true; - } - public function onActivate(Item $item, Player $player = null){ $tile = $this->level->getTile($this); if(!($tile instanceof TileItemFrame)){ diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index 9bef03bd8..ffc65df1f 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -43,10 +43,6 @@ class Sapling extends Flowable{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getName(){ static $names = [ 0 => "Oak Sapling", diff --git a/src/pocketmine/block/TNT.php b/src/pocketmine/block/TNT.php index 1075f560d..2d964505d 100644 --- a/src/pocketmine/block/TNT.php +++ b/src/pocketmine/block/TNT.php @@ -49,10 +49,6 @@ class TNT extends Solid{ return 0; } - public function canBeActivated(){ - return true; - } - public function onActivate(Item $item, Player $player = null){ if($item->getId() === Item::FLINT_STEEL){ $item->useOn($this); diff --git a/src/pocketmine/block/Trapdoor.php b/src/pocketmine/block/Trapdoor.php index add4d6a1a..93aa586eb 100644 --- a/src/pocketmine/block/Trapdoor.php +++ b/src/pocketmine/block/Trapdoor.php @@ -52,10 +52,6 @@ class Trapdoor extends Transparent{ return 3; } - public function canBeActivated(){ - return true; - } - protected function recalculateBoundingBox(){ $damage = $this->getDamage(); diff --git a/src/pocketmine/block/WoodDoor.php b/src/pocketmine/block/WoodDoor.php index b985064f7..64ceea5ea 100644 --- a/src/pocketmine/block/WoodDoor.php +++ b/src/pocketmine/block/WoodDoor.php @@ -38,10 +38,6 @@ class WoodDoor extends Door{ return "Wood Door Block"; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 3; } diff --git a/src/pocketmine/block/Workbench.php b/src/pocketmine/block/Workbench.php index 199a4e648..fab2ee388 100644 --- a/src/pocketmine/block/Workbench.php +++ b/src/pocketmine/block/Workbench.php @@ -35,10 +35,6 @@ class Workbench extends Solid{ $this->meta = $meta; } - public function canBeActivated(){ - return true; - } - public function getHardness(){ return 2.5; } diff --git a/src/pocketmine/item/Bucket.php b/src/pocketmine/item/Bucket.php index fd82dd169..d276d04d1 100644 --- a/src/pocketmine/item/Bucket.php +++ b/src/pocketmine/item/Bucket.php @@ -39,10 +39,6 @@ class Bucket extends Item{ return 1; } - public function canBeActivated(){ - return true; - } - public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ $targetBlock = Block::get($this->meta); diff --git a/src/pocketmine/item/FlintSteel.php b/src/pocketmine/item/FlintSteel.php index 912aac4df..cfb1d24c7 100644 --- a/src/pocketmine/item/FlintSteel.php +++ b/src/pocketmine/item/FlintSteel.php @@ -34,10 +34,6 @@ class FlintSteel extends Tool{ parent::__construct(self::FLINT_STEEL, $meta, $count, "Flint and Steel"); } - public function canBeActivated(){ - return true; - } - public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ if($block->getId() === self::AIR and ($target instanceof Solid)){ $level->setBlock($block, new Fire(), true); diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index c708af210..f87575688 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -93,10 +93,6 @@ class Item implements ItemIds, \JsonSerializable{ /** @var string */ protected $name; - public function canBeActivated(){ - return false; - } - public static function init(){ if(self::$list === null){ self::$list = new \SplFixedArray(65536); diff --git a/src/pocketmine/item/Painting.php b/src/pocketmine/item/Painting.php index 124749b17..3de9bcc0b 100644 --- a/src/pocketmine/item/Painting.php +++ b/src/pocketmine/item/Painting.php @@ -32,10 +32,6 @@ class Painting extends Item{ parent::__construct(self::PAINTING, 0, $count, "Painting"); } - public function canBeActivated(){ - return true; - } - public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ if($target->isTransparent() === false and $face > 1 and $block->isSolid() === false){ $faces = [ diff --git a/src/pocketmine/item/SpawnEgg.php b/src/pocketmine/item/SpawnEgg.php index b9f545842..2ba0c7554 100644 --- a/src/pocketmine/item/SpawnEgg.php +++ b/src/pocketmine/item/SpawnEgg.php @@ -38,10 +38,6 @@ class SpawnEgg extends Item{ parent::__construct(self::SPAWN_EGG, $meta, $count, "Spawn Egg"); } - public function canBeActivated(){ - return true; - } - public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ $nbt = new CompoundTag("", [ new ListTag("Pos", [ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 203d0a44e..2cb346565 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -1757,11 +1757,11 @@ class Level implements ChunkManager, Metadatable{ $this->server->getPluginManager()->callEvent($ev); if(!$ev->isCancelled()){ $target->onUpdate(self::BLOCK_UPDATE_TOUCH); - if(!$player->isSneaking() and $target->canBeActivated() === true and $target->onActivate($item, $player) === true){ + if(!$player->isSneaking() and $target->onActivate($item, $player) === true){ return true; } - if(!$player->isSneaking() and $item->canBeActivated() and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){ + if(!$player->isSneaking() and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){ if($item->getCount() <= 0){ $item = Item::get(Item::AIR, 0, 0); @@ -1771,7 +1771,7 @@ class Level implements ChunkManager, Metadatable{ }else{ return false; } - }elseif($target->canBeActivated() === true and $target->onActivate($item, $player) === true){ + }elseif($target->onActivate($item, $player) === true){ return true; }