Removed unnecessary methods Block->canBeActivated() and Item->canBeActivated() (needless extra confusion)

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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);

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;
 	}

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;
 	}

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;
 	}

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;
 	}

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,

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";
 	}

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)){

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",

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);

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();

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;
 	}

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;
 	}

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);
 

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);

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);

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 = [

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", [

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;
 		}