Merge changes from master

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,9 @@
 ### Issue description
-<!--- use our forum https://forums.pmmp.io for questions -->
+<!---
+THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below. 
+- http://pmmp.readthedocs.io/en/rtfd/ - Documentation
+- https://forums.pmmp.io - PMMP Forums
+-->
 <!--- Any issues requesting updates to new versions of MCPE will be treated as spam. We do not need issues to tell us that there is a new version available. -->
 <!--- 
 Write a short description about the issue

src/pocketmine/Player.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
-use pocketmine\block\Air;
 use pocketmine\block\Bed;
 use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
@@ -84,6 +83,7 @@ use pocketmine\inventory\ShapedRecipe;
 use pocketmine\inventory\ShapelessRecipe;
 use pocketmine\inventory\transaction\SimpleInventoryTransaction;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\ChunkLoader;
 use pocketmine\level\format\Chunk;
 use pocketmine\level\Level;
@@ -1425,7 +1425,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			}
 
 			if($entity instanceof Arrow and $entity->hadCollision){
-				$item = Item::get(Item::ARROW, 0, 1);
+				$item = ItemFactory::get(Item::ARROW, 0, 1);
 				if($this->isSurvival() and !$this->inventory->canAddItem($item)){
 					continue;
 				}
@@ -2314,7 +2314,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							$snowball->setMotion($snowball->getMotion()->multiply($f));
 							if($this->isSurvival()){
 								$item->setCount($item->getCount() - 1);
-								$this->inventory->setItemInHand($item->getCount() > 0 ? $item : Item::get(Item::AIR));
+								$this->inventory->setItemInHand($item->getCount() > 0 ? $item : ItemFactory::get(Item::AIR));
 							}
 							if($snowball instanceof Projectile){
 								$this->server->getPluginManager()->callEvent($projectileEv = new ProjectileLaunchEvent($snowball));
@@ -2439,7 +2439,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 								$ev->setCancelled();
 							}
 
-							$target->attack($ev->getFinalDamage(), $ev);
+							$target->attack($ev);
 
 							if($ev->isCancelled()){
 								if($item->isTool() and $this->isSurvival()){
@@ -2451,7 +2451,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 							if($this->isSurvival()){
 								if($item->isTool()){
 									if($item->useOn($target) and $item->getDamage() >= $item->getMaxDurability()){
-										$this->inventory->setItemInHand(Item::get(Item::AIR, 0, 1));
+										$this->inventory->setItemInHand(ItemFactory::get(Item::AIR, 0, 1));
 									}else{
 										$this->inventory->setItemInHand($item);
 									}
@@ -2473,7 +2473,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 						if($this->startAction > -1 and $this->getGenericFlag(self::DATA_FLAG_ACTION)){
 							if($this->inventory->getItemInHand()->getId() === Item::BOW){
 								$bow = $this->inventory->getItemInHand();
-								if($this->isSurvival() and !$this->inventory->contains(Item::get(Item::ARROW, 0, 1))){
+								if($this->isSurvival() and !$this->inventory->contains(ItemFactory::get(Item::ARROW, 0, 1))){
 									$this->inventory->sendContents($this);
 									return false;
 								}
@@ -2514,10 +2514,10 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 								}else{
 									$ev->getProjectile()->setMotion($ev->getProjectile()->getMotion()->multiply($ev->getForce()));
 									if($this->isSurvival()){
-										$this->inventory->removeItem(Item::get(Item::ARROW, 0, 1));
+										$this->inventory->removeItem(ItemFactory::get(Item::ARROW, 0, 1));
 										$bow->setDamage($bow->getDamage() + 1);
 										if($bow->getDamage() >= 385){
-											$this->inventory->setItemInHand(Item::get(Item::AIR, 0, 0));
+											$this->inventory->setItemInHand(ItemFactory::get(Item::AIR, 0, 0));
 										}else{
 											$this->inventory->setItemInHand($bow);
 										}
@@ -2574,7 +2574,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 								$slot = $this->inventory->getItemInHand();
 								--$slot->count;
 								$this->inventory->setItemInHand($slot);
-								$this->inventory->addItem(Item::get(Item::BUCKET, 0, 1));
+								$this->inventory->addItem(ItemFactory::get(Item::BUCKET, 0, 1));
 							}
 
 							$this->removeAllEffects();
@@ -3016,7 +3016,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 				$newItem = clone $item;
 				$newItem->setCount($item->getCount() - $count);
 			}else{
-				$newItem = Item::get(Item::AIR, 0, 0);
+				$newItem = ItemFactory::get(Item::AIR, 0, 0);
 			}
 
 			$this->inventory->setItem($slot, $newItem);
@@ -3048,7 +3048,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			case Item::CAKE:
 				//TODO: detect complex recipes like cake that leave remains
 				$this->awardAchievement("bakeCake");
-				$this->inventory->addItem(Item::get(Item::BUCKET, 0, 3));
+				$this->inventory->addItem(ItemFactory::get(Item::BUCKET, 0, 3));
 				break;
 			case Item::STONE_PICKAXE:
 			case Item::GOLDEN_PICKAXE:
@@ -3734,7 +3734,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		}
 	}
 
-	public function attack($damage, EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source){
 		if(!$this->isAlive()){
 			return;
 		}
@@ -3749,7 +3749,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 			$source->setCancelled();
 		}
 
-		parent::attack($damage, $source);
+		parent::attack($source);
 
 		if($source->isCancelled()){
 			return;

src/pocketmine/Server.php

@@ -49,7 +49,7 @@ use pocketmine\event\TranslationContainer;
 use pocketmine\inventory\CraftingManager;
 use pocketmine\inventory\Recipe;
 use pocketmine\item\enchantment\Enchantment;
-use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\lang\BaseLang;
 use pocketmine\level\format\io\leveldb\LevelDB;
 use pocketmine\level\format\io\LevelProvider;
@@ -1584,7 +1584,7 @@ class Server{
 			Tile::init();
 			BlockFactory::init();
 			Enchantment::init();
-			Item::init();
+			ItemFactory::init();
 			Biome::init();
 			Effect::init();
 			Attribute::init();

src/pocketmine/block/Anvil.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\inventory\AnvilInventory;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -83,7 +84,7 @@ class Anvil extends Fallable{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
-				Item::get($this->getItemId(), $this->getDamage() & 0x0c, 1),
+				ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c, 1),
 			];
 		}
 

src/pocketmine/block/Bed.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\TranslationContainer;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -205,10 +206,10 @@ class Bed extends Transparent{
 		return false;
 	}
 
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
 		$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
 		if(($other = $this->getOtherHalf()) !== null){
-			$this->getLevel()->useBreakOn($other); //make sure tiles get removed
+			$this->getLevel()->useBreakOn($other, $item, $player, $player !== null); //make sure tiles get removed
 		}
 
 		return true;
@@ -219,11 +220,11 @@ class Bed extends Transparent{
 			$tile = $this->getLevel()->getTile($this);
 			if($tile instanceof TileBed){
 				return [
-					Item::get($this->getItemId(), $tile->getColor(), 1)
+					ItemFactory::get($this->getItemId(), $tile->getColor(), 1)
 				];
 			}else{
 				return [
-					Item::get($this->getItemId(), 14, 1) //Red
+					ItemFactory::get($this->getItemId(), 14, 1) //Red
 				];
 			}
 		}

src/pocketmine/block/Beetroot.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Beetroot extends Crops{
 
@@ -40,13 +41,13 @@ class Beetroot extends Crops{
 	public function getDrops(Item $item) : array{
 		if($this->meta >= 0x07){
 			return [
-				Item::get(Item::BEETROOT, 0, 1),
+				ItemFactory::get(Item::BEETROOT, 0, 1),
-				Item::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3))
+				ItemFactory::get(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3))
 			];
 		}
 
 		return [
-			Item::get(Item::BEETROOT_SEEDS, 0, 1)
+			ItemFactory::get(Item::BEETROOT_SEEDS, 0, 1)
 		];
 	}
 }

src/pocketmine/block/Block.php

@@ -28,6 +28,7 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\level\MovingObjectPosition;
@@ -42,7 +43,9 @@ use pocketmine\plugin\Plugin;
 class Block extends Position implements BlockIds, Metadatable{
 
 	/**
-	 * @deprecated This functionality has moved to {@link BlockFactory#get}
+	 * Returns a new Block instance with the specified ID, meta and position.
+	 *
+	 * This function redirects to {@link BlockFactory#get}.
 	 *
 	 * @param int           $id
 	 * @param int           $meta
@@ -160,11 +163,12 @@ class Block extends Position implements BlockIds, Metadatable{
 	/**
 	 * Do the actions needed so the block is broken with the Item
 	 *
-	 * @param Item $item
+	 * @param Item        $item
+	 * @param Player|null $player
 	 *
 	 * @return bool
 	 */
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
 		return $this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
 	}
 
@@ -338,7 +342,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 */
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1),
+			ItemFactory::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1),
 		];
 	}
 

src/pocketmine/block/BlockFactory.php

@@ -360,6 +360,8 @@ class BlockFactory{
 	}
 
 	/**
+	 * Returns a new Block instance with the specified ID, meta and position.
+	 *
 	 * @param int      $id
 	 * @param int      $meta
 	 * @param Position $pos

src/pocketmine/block/Bookshelf.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class Bookshelf extends Solid{
@@ -48,7 +49,7 @@ class Bookshelf extends Solid{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::BOOK, 0, 3)
+			ItemFactory::get(Item::BOOK, 0, 3)
 		];
 	}
 

src/pocketmine/block/BrownMushroom.php

@@ -67,8 +67,4 @@ class BrownMushroom extends Flowable{
 		return false;
 	}
 
-	protected function recalculateBoundingBox(){
-		return null;
-	}
-
 }

src/pocketmine/block/Cactus.php

@@ -68,7 +68,7 @@ class Cactus extends Transparent{
 
 	public function onEntityCollide(Entity $entity){
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
-		$entity->attack($ev->getFinalDamage(), $ev);
+		$entity->attack($ev);
 	}
 
 	public function onUpdate(int $type){

src/pocketmine/block/Carrot.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Carrot extends Crops{
 
@@ -39,7 +40,7 @@ class Carrot extends Crops{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::CARROT, 0, $this->meta >= 0x07 ? mt_rand(1, 4) : 1)
+			ItemFactory::get(Item::CARROT, 0, $this->meta >= 0x07 ? mt_rand(1, 4) : 1)
 		];
 	}
 }

src/pocketmine/block/Chest.php

@@ -124,7 +124,7 @@ class Chest extends Transparent{
 		return true;
 	}
 
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
 		$t = $this->getLevel()->getTile($this);
 		if($t instanceof TileChest){
 			$t->unpair();

src/pocketmine/block/Clay.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class Clay extends Solid{
@@ -48,7 +49,7 @@ class Clay extends Solid{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::CLAY_BALL, 0, 4)
+			ItemFactory::get(Item::CLAY_BALL, 0, 4)
 		];
 	}
 }

src/pocketmine/block/CoalOre.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class CoalOre extends Solid{
@@ -49,7 +50,7 @@ class CoalOre extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
-				Item::get(Item::COAL, 0, 1)
+				ItemFactory::get(Item::COAL, 0, 1)
 			];
 		}
 

src/pocketmine/block/DiamondOre.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class DiamondOre extends Solid{
@@ -49,7 +50,7 @@ class DiamondOre extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
-				Item::get(Item::DIAMOND, 0, 1)
+				ItemFactory::get(Item::DIAMOND, 0, 1)
 			];
 		}
 

src/pocketmine/block/Door.php

@@ -246,7 +246,7 @@ abstract class Door extends Transparent{
 		return false;
 	}
 
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
 		if(($this->getDamage() & 0x08) === 0x08){
 			$down = $this->getSide(Vector3::SIDE_DOWN);
 			if($down->getId() === $this->getId()){

src/pocketmine/block/DoublePlant.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -96,9 +97,9 @@ class DoublePlant extends Flowable{
 		return false;
 	}
 
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
-		if(parent::onBreak($item) and $this->isValidHalfPlant()){
+		if(parent::onBreak($item, $player) and $this->isValidHalfPlant()){
-			return $this->getLevel()->setBlock($this->getSide(($this->meta & self::BITFLAG_TOP) !== 0 ? Vector3::SIDE_DOWN : Vector3::SIDE_UP), BlockFactory::get(Block::AIR));
+			$this->getLevel()->useBreakOn($this->getSide(($this->meta & self::BITFLAG_TOP) !== 0 ? Vector3::SIDE_DOWN : Vector3::SIDE_UP), $item, $player, $player !== null);
 		}
 
 		return false;
@@ -109,16 +110,20 @@ class DoublePlant extends Flowable{
 	}
 
 	public function getDrops(Item $item) : array{
-		if(!$item->isShears() and ($this->meta === 2 or $this->meta === 3)){ //grass or fern
+		if($this->meta & self::BITFLAG_TOP){
-			if(mt_rand(0, 24) === 0){
+			if(!$item->isShears() and ($this->meta === 2 or $this->meta === 3)){ //grass or fern
-				return [
+				if(mt_rand(0, 24) === 0){
-					Item::get(Item::SEEDS, 0, 1)
+					return [
-				];
+						ItemFactory::get(Item::SEEDS, 0, 1)
+					];
+				}
+
+				return [];
 			}
 
-			return [];
+			return parent::getDrops($item);
 		}
 
-		return parent::getDrops($item);
+		return [];
 	}
 }

src/pocketmine/block/DoubleStoneSlab.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class DoubleStoneSlab extends Solid{
@@ -59,7 +60,7 @@ class DoubleStoneSlab extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
-				Item::get(Item::STONE_SLAB, $this->getDamage() & 0x07, 2),
+				ItemFactory::get(Item::STONE_SLAB, $this->getDamage() & 0x07, 2),
 			];
 		}
 

src/pocketmine/block/DoubleWoodenSlab.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class DoubleWoodenSlab extends Solid{
@@ -56,7 +57,7 @@ class DoubleWoodenSlab extends Solid{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::WOODEN_SLAB, $this->getDamage() & 0x07, 2)
+			ItemFactory::get(Item::WOODEN_SLAB, $this->getDamage() & 0x07, 2)
 		];
 	}
 

src/pocketmine/block/EmeraldOre.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class EmeraldOre extends Solid{
@@ -49,7 +50,7 @@ class EmeraldOre extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
-				Item::get(Item::EMERALD, 0, 1),
+				ItemFactory::get(Item::EMERALD, 0, 1),
 			];
 		}
 

src/pocketmine/block/Farmland.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
@@ -60,7 +61,7 @@ class Farmland extends Transparent{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::DIRT, 0, 1)
+			ItemFactory::get(Item::DIRT, 0, 1)
 		];
 	}
 }

src/pocketmine/block/Fire.php

@@ -63,7 +63,7 @@ class Fire extends Flowable{
 
 	public function onEntityCollide(Entity $entity){
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
-		$entity->attack($ev->getFinalDamage(), $ev);
+		$entity->attack($ev);
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
 		if($entity instanceof Arrow){

src/pocketmine/block/FlowerPot.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -116,7 +117,7 @@ class FlowerPot extends Flowable{
 		if($player instanceof Player){
 			if($player->isSurvival()){
 				$item->setCount($item->getCount() - 1);
-				$player->getInventory()->setItemInHand($item->getCount() > 0 ? $item : Item::get(Item::AIR));
+				$player->getInventory()->setItemInHand($item->getCount() > 0 ? $item : ItemFactory::get(Item::AIR));
 			}
 		}
 		return true;

src/pocketmine/block/Glowstone.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class Glowstone extends Transparent{
@@ -52,7 +53,7 @@ class Glowstone extends Transparent{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4))
+			ItemFactory::get(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4))
 		];
 	}
 }

src/pocketmine/block/Grass.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
@@ -54,7 +55,7 @@ class Grass extends Solid{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::DIRT, 0, 1),
+			ItemFactory::get(Item::DIRT, 0, 1),
 		];
 	}
 

src/pocketmine/block/GrassPath.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
@@ -60,7 +61,7 @@ class GrassPath extends Transparent{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::DIRT, 0, 1)
+			ItemFactory::get(Item::DIRT, 0, 1)
 		];
 	}
 }

src/pocketmine/block/Gravel.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class Gravel extends Fallable{
@@ -49,7 +50,7 @@ class Gravel extends Fallable{
 	public function getDrops(Item $item) : array{
 		if(mt_rand(1, 10) === 1){
 			return [
-				Item::get(Item::FLINT, 0, 1)
+				ItemFactory::get(Item::FLINT, 0, 1)
 			];
 		}
 

src/pocketmine/block/Ice.php

@@ -26,6 +26,7 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\Tool;
 use pocketmine\level\Level;
+use pocketmine\Player;
 
 class Ice extends Transparent{
 
@@ -51,7 +52,7 @@ class Ice extends Transparent{
 		return Tool::TYPE_PICKAXE;
 	}
 
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
 		$this->getLevel()->setBlock($this, BlockFactory::get(Block::WATER), true);
 
 		return true;

src/pocketmine/block/ItemFrame.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\{
@@ -69,7 +70,7 @@ class ItemFrame extends Flowable{
 				$item->setCount($item->getCount() - 1);
 				$tile->setItem($frameItem);
 				if($player instanceof Player and $player->isSurvival()){
-					$player->getInventory()->setItemInHand($item->getCount() <= 0 ? Item::get(Item::AIR) : $item);
+					$player->getInventory()->setItemInHand($item->getCount() <= 0 ? ItemFactory::get(Item::AIR) : $item);
 				}
 			}
 		}
@@ -77,7 +78,7 @@ class ItemFrame extends Flowable{
 		return true;
 	}
 
-	public function onBreak(Item $item) : bool{
+	public function onBreak(Item $item, Player $player = null) : bool{
 		$tile = $this->level->getTile($this);
 		if($tile instanceof TileItemFrame){
 			//TODO: add events
@@ -85,7 +86,7 @@ class ItemFrame extends Flowable{
 				$this->level->dropItem($tile->getBlock(), $tile->getItem());
 			}
 		}
-		return parent::onBreak($item);
+		return parent::onBreak($item, $player);
 	}
 
 	public function onUpdate(int $type){

src/pocketmine/block/LapisOre.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class LapisOre extends Solid{
@@ -49,7 +50,7 @@ class LapisOre extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_STONE){
 			return [
-				Item::get(Item::DYE, 4, mt_rand(4, 8))
+				ItemFactory::get(Item::DYE, 4, mt_rand(4, 8))
 			];
 		}
 

src/pocketmine/block/Lava.php

@@ -52,7 +52,7 @@ class Lava extends Liquid{
 		$entity->fallDistance *= 0.5;
 
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4);
-		$entity->attack($ev->getFinalDamage(), $ev);
+		$entity->attack($ev);
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 15);
 		Server::getInstance()->getPluginManager()->callEvent($ev);

src/pocketmine/block/Leaves.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -170,13 +171,13 @@ class Leaves extends Transparent{
 		$variantMeta = $this->getDamage() & 0x03;
 
 		if($item->isShears()){
-			$drops[] = Item::get($this->getItemId(), $variantMeta, 1);
+			$drops[] = ItemFactory::get($this->getItemId(), $variantMeta, 1);
 		}else{
 			if(mt_rand(1, 20) === 1){ //Saplings
-				$drops[] = Item::get(Item::SAPLING, $variantMeta, 1);
+				$drops[] = ItemFactory::get(Item::SAPLING, $variantMeta, 1);
 			}
 			if($variantMeta === self::OAK and mt_rand(1, 200) === 1){ //Apples
-				$drops[] = Item::get(Item::APPLE, 0, 1);
+				$drops[] = ItemFactory::get(Item::APPLE, 0, 1);
 			}
 		}
 

src/pocketmine/block/Leaves2.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Leaves2 extends Leaves{
 
@@ -43,11 +44,11 @@ class Leaves2 extends Leaves{
 
 		if($item->isShears()){
 			return [
-				Item::get($this->getItemId(), $variantMeta, 1)
+				ItemFactory::get($this->getItemId(), $variantMeta, 1)
 			];
 		}elseif(mt_rand(1, 20) === 1){ //Saplings
 			return [
-				Item::get(Item::SAPLING, $variantMeta + 4, 1)
+				ItemFactory::get(Item::SAPLING, $variantMeta + 4, 1)
 			];
 		}
 

src/pocketmine/block/Magma.php

@@ -60,7 +60,7 @@ class Magma extends Solid{
 	public function onEntityCollide(Entity $entity){
 		if(!$entity->isSneaking()){
 			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
-			$entity->attack($ev->getFinalDamage(), $ev);
+			$entity->attack($ev);
 		}
 	}
 

src/pocketmine/block/Melon.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class Melon extends Transparent{
@@ -48,7 +49,7 @@ class Melon extends Transparent{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::MELON_SLICE, 0, mt_rand(3, 7))
+			ItemFactory::get(Item::MELON_SLICE, 0, mt_rand(3, 7))
 		];
 	}
 }

src/pocketmine/block/MelonStem.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
@@ -84,7 +85,7 @@ class MelonStem extends Crops{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::MELON_SEEDS, 0, mt_rand(0, 2))
+			ItemFactory::get(Item::MELON_SEEDS, 0, mt_rand(0, 2))
 		];
 	}
 }

src/pocketmine/block/Mycelium.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -52,7 +53,7 @@ class Mycelium extends Solid{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::DIRT, 0, 1)
+			ItemFactory::get(Item::DIRT, 0, 1)
 		];
 	}
 

src/pocketmine/block/NetherQuartzOre.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class NetherQuartzOre extends Solid{
@@ -49,7 +50,7 @@ class NetherQuartzOre extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
-				Item::get(Item::QUARTZ, 0, 1)
+				ItemFactory::get(Item::QUARTZ, 0, 1)
 			];
 		}
 

src/pocketmine/block/NetherReactor.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class NetherReactor extends Solid{
@@ -53,8 +54,8 @@ class NetherReactor extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
-				Item::get(Item::IRON_INGOT, 0, 6),
+				ItemFactory::get(Item::IRON_INGOT, 0, 6),
-				Item::get(Item::DIAMOND, 0, 3)
+				ItemFactory::get(Item::DIAMOND, 0, 3)
 			];
 		}
 

src/pocketmine/block/NetherWartPlant.php

@@ -26,6 +26,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -78,7 +79,7 @@ class NetherWartPlant extends Flowable{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get($this->getItemId(), 0, ($this->getDamage() === 3 ? mt_rand(2, 4) : 1))
+			ItemFactory::get($this->getItemId(), 0, ($this->getDamage() === 3 ? mt_rand(2, 4) : 1))
 		];
 	}
 }

src/pocketmine/block/Potato.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Potato extends Crops{
 
@@ -39,7 +40,7 @@ class Potato extends Crops{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::POTATO, 0, $this->getDamage() >= 0x07 ? mt_rand(1, 4) : 1)
+			ItemFactory::get(Item::POTATO, 0, $this->getDamage() >= 0x07 ? mt_rand(1, 4) : 1)
 		];
 	}
 }

src/pocketmine/block/PumpkinStem.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
@@ -84,7 +85,7 @@ class PumpkinStem extends Crops{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2))
+			ItemFactory::get(Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2))
 		];
 	}
 }

src/pocketmine/block/RedstoneOre.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -66,7 +67,7 @@ class RedstoneOre extends Solid{
 	public function getDrops(Item $item) : array{
 		if($item->isPickaxe() >= Tool::TIER_IRON){
 			return [
-				Item::get(Item::REDSTONE_DUST, 0, mt_rand(4, 5))
+				ItemFactory::get(Item::REDSTONE_DUST, 0, mt_rand(4, 5))
 			];
 		}
 

src/pocketmine/block/Sapling.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\generator\object\Tree;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -109,7 +110,7 @@ class Sapling extends Flowable{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get($this->getItemId(), $this->getDamage() & 0x07, 1)
+			ItemFactory::get($this->getItemId(), $this->getDamage() & 0x07, 1)
 		];
 	}
 

src/pocketmine/block/SeaLantern.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class SeaLantern extends Transparent{
 
@@ -47,7 +48,7 @@ class SeaLantern extends Transparent{
 
 	public function getDrops(Item $item) : array{
 		return [
-			Item::get(Item::PRISMARINE_CRYSTALS, 0, 3)
+			ItemFactory::get(Item::PRISMARINE_CRYSTALS, 0, 3)
 		];
 	}
 

src/pocketmine/block/Skull.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\ByteTag;
@@ -94,7 +95,7 @@ class Skull extends Flowable{
 		$tile = $this->level->getTile($this);
 		if($tile instanceof SkullTile){
 			return [
-				Item::get(Item::SKULL, $tile->getType(), 1)
+				ItemFactory::get(Item::SKULL, $tile->getType(), 1)
 			];
 		}
 

src/pocketmine/block/SnowLayer.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -86,7 +87,7 @@ class SnowLayer extends Flowable{
 	public function getDrops(Item $item) : array{
 		if($item->isShovel() !== false){
 			return [
-				Item::get(Item::SNOWBALL, 0, 1) //TODO: check layer count
+				ItemFactory::get(Item::SNOWBALL, 0, 1) //TODO: check layer count
 			];
 		}
 

src/pocketmine/block/Stone.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class Stone extends Solid{
@@ -66,7 +67,7 @@ class Stone extends Solid{
 		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			if($this->getDamage() === self::NORMAL){
 				return [
-					Item::get(Item::COBBLESTONE, $this->getDamage(), 1)
+					ItemFactory::get(Item::COBBLESTONE, $this->getDamage(), 1)
 				];
 			}
 

src/pocketmine/block/TallGrass.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -76,7 +77,7 @@ class TallGrass extends Flowable{
 	public function getDrops(Item $item) : array{
 		if(mt_rand(0, 15) === 0){
 			return [
-				Item::get(Item::WHEAT_SEEDS, 0, 1)
+				ItemFactory::get(Item::WHEAT_SEEDS, 0, 1)
 			];
 		}
 

src/pocketmine/block/Wheat.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 
 class Wheat extends Crops{
 
@@ -40,12 +41,12 @@ class Wheat extends Crops{
 	public function getDrops(Item $item) : array{
 		if($this->meta >= 0x07){
 			return [
-				Item::get(Item::WHEAT, 0, 1),
+				ItemFactory::get(Item::WHEAT, 0, 1),
-				Item::get(Item::WHEAT_SEEDS, 0, mt_rand(0, 3))
+				ItemFactory::get(Item::WHEAT_SEEDS, 0, mt_rand(0, 3))
 			];
 		}else{
 			return [
-				Item::get(Item::WHEAT_SEEDS, 0, 1)
+				ItemFactory::get(Item::WHEAT_SEEDS, 0, 1)
 			];
 		}
 	}

src/pocketmine/block/WoodenStairs.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\item\Tool;
 
 class WoodenStairs extends Stair{
@@ -43,7 +44,7 @@ class WoodenStairs extends Stair{
 	public function getDrops(Item $item) : array{
 		//TODO: Hierarchy problem (base class is for stone stairs)
 		return [
-			Item::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1)
+			ItemFactory::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1)
 		];
 	}
 }

src/pocketmine/command/defaults/BanCommand.php

@@ -31,7 +31,7 @@ use pocketmine\Player;
 
 class BanCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.ban.player.description",

src/pocketmine/command/defaults/BanIpCommand.php

@@ -31,7 +31,7 @@ use pocketmine\Player;
 
 class BanIpCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.ban.ip.description",
@@ -71,7 +71,7 @@ class BanIpCommand extends VanillaCommand{
 		return true;
 	}
 
-	private function processIPBan($ip, CommandSender $sender, $reason){
+	private function processIPBan(string $ip, CommandSender $sender, string $reason){
 		$sender->getServer()->getIPBans()->addBan($ip, $reason, null, $sender->getName());
 
 		foreach($sender->getServer()->getOnlinePlayers() as $player){

src/pocketmine/command/defaults/BanListCommand.php

@@ -30,7 +30,7 @@ use pocketmine\permission\BanEntry;
 
 class BanListCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.banlist.description",

src/pocketmine/command/defaults/DefaultGamemodeCommand.php

@@ -30,7 +30,7 @@ use pocketmine\Server;
 
 class DefaultGamemodeCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.defaultgamemode.description",

src/pocketmine/command/defaults/DeopCommand.php

@@ -32,7 +32,7 @@ use pocketmine\utils\TextFormat;
 
 class DeopCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.deop.description",

src/pocketmine/command/defaults/DifficultyCommand.php

@@ -32,7 +32,7 @@ use pocketmine\Server;
 
 class DifficultyCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.difficulty.description",

src/pocketmine/command/defaults/DumpMemoryCommand.php

@@ -29,7 +29,7 @@ class DumpMemoryCommand extends VanillaCommand{
 
 	private static $executions = 0;
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"Dumps the memory",

src/pocketmine/command/defaults/EffectCommand.php

@@ -31,7 +31,7 @@ use pocketmine\utils\TextFormat;
 
 class EffectCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.effect.description",

src/pocketmine/command/defaults/EnchantCommand.php

@@ -31,7 +31,7 @@ use pocketmine\utils\TextFormat;
 
 class EnchantCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.enchant.description",

src/pocketmine/command/defaults/GamemodeCommand.php

@@ -33,7 +33,7 @@ use pocketmine\utils\TextFormat;
 
 class GamemodeCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.gamemode.description",

src/pocketmine/command/defaults/GarbageCollectorCommand.php

@@ -28,7 +28,7 @@ use pocketmine\utils\TextFormat;
 
 class GarbageCollectorCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.gc.description",

src/pocketmine/command/defaults/GiveCommand.php

@@ -27,7 +27,7 @@ use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\event\TranslationContainer;
-use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\nbt\JsonNBTParser;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\Player;
@@ -35,7 +35,7 @@ use pocketmine\utils\TextFormat;
 
 class GiveCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.give.description",
@@ -54,7 +54,7 @@ class GiveCommand extends VanillaCommand{
 		}
 
 		$player = $sender->getServer()->getPlayer($args[0]);
-		$item = Item::fromString($args[1]);
+		$item = ItemFactory::fromString($args[1]);
 
 		if(!isset($args[2])){
 			$item->setCount($item->getMaxStackSize());

src/pocketmine/command/defaults/HelpCommand.php

@@ -30,7 +30,7 @@ use pocketmine\utils\TextFormat;
 
 class HelpCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.help.description",

src/pocketmine/command/defaults/KickCommand.php

@@ -32,7 +32,7 @@ use pocketmine\utils\TextFormat;
 
 class KickCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.kick.description",

src/pocketmine/command/defaults/KillCommand.php

@@ -33,7 +33,7 @@ use pocketmine\utils\TextFormat;
 
 class KillCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.kill.description",

src/pocketmine/command/defaults/ListCommand.php

@@ -29,7 +29,7 @@ use pocketmine\Player;
 
 class ListCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.list.description",

src/pocketmine/command/defaults/MeCommand.php

@@ -31,7 +31,7 @@ use pocketmine\utils\TextFormat;
 
 class MeCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.me.description",

src/pocketmine/command/defaults/OpCommand.php

@@ -32,7 +32,7 @@ use pocketmine\utils\TextFormat;
 
 class OpCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.op.description",

src/pocketmine/command/defaults/PardonCommand.php

@@ -30,7 +30,7 @@ use pocketmine\event\TranslationContainer;
 
 class PardonCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.unban.player.description",

src/pocketmine/command/defaults/PardonIpCommand.php

@@ -30,7 +30,7 @@ use pocketmine\event\TranslationContainer;
 
 class PardonIpCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.unban.ip.description",

src/pocketmine/command/defaults/ParticleCommand.php

@@ -28,6 +28,7 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\event\TranslationContainer;
 use pocketmine\item\Item;
+use pocketmine\item\ItemFactory;
 use pocketmine\level\particle\AngryVillagerParticle;
 use pocketmine\level\particle\BlockForceFieldParticle;
 use pocketmine\level\particle\BubbleParticle;
@@ -63,7 +64,7 @@ use pocketmine\utils\TextFormat;
 
 class ParticleCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.particle.description",
@@ -125,7 +126,6 @@ class ParticleCommand extends VanillaCommand{
 
 	/**
 	 * @param string   $name
-	 *
 	 * @param Vector3  $pos
 	 * @param float    $xd
 	 * @param float    $yd
@@ -134,7 +134,7 @@ class ParticleCommand extends VanillaCommand{
 	 *
 	 * @return Particle|null
 	 */
-	private function getParticle($name, Vector3 $pos, $xd, $yd, $zd, $data){
+	private function getParticle(string $name, Vector3 $pos, float $xd, float $yd, float $zd, int $data = null){
 		switch($name){
 			case "explode":
 				return new ExplodeParticle($pos);
@@ -173,12 +173,12 @@ class ParticleCommand extends VanillaCommand{
 			case "reddust":
 				return new RedstoneParticle($pos, $data ?? 1);
 			case "snowballpoof":
-				return new ItemBreakParticle($pos, Item::get(Item::SNOWBALL));
+				return new ItemBreakParticle($pos, ItemFactory::get(Item::SNOWBALL));
 			case "slime":
-				return new ItemBreakParticle($pos, Item::get(Item::SLIMEBALL));
+				return new ItemBreakParticle($pos, ItemFactory::get(Item::SLIMEBALL));
 			case "itembreak":
 				if($data !== null and $data !== 0){
-					return new ItemBreakParticle($pos, Item::get($data));
+					return new ItemBreakParticle($pos, ItemFactory::get($data));
 				}
 				break;
 			case "terrain":
@@ -206,7 +206,7 @@ class ParticleCommand extends VanillaCommand{
 		if(strpos($name, "iconcrack_") === 0){
 			$d = explode("_", $name);
 			if(count($d) === 3){
-				return new ItemBreakParticle($pos, Item::get((int) $d[1], (int) $d[2]));
+				return new ItemBreakParticle($pos, ItemFactory::get((int) $d[1], (int) $d[2]));
 			}
 		}elseif(strpos($name, "blockcrack_") === 0){
 			$d = explode("_", $name);

src/pocketmine/command/defaults/PluginsCommand.php

@@ -29,7 +29,7 @@ use pocketmine\utils\TextFormat;
 
 class PluginsCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.plugins.description",

src/pocketmine/command/defaults/ReloadCommand.php

@@ -30,7 +30,7 @@ use pocketmine\utils\TextFormat;
 
 class ReloadCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.reload.description",

src/pocketmine/command/defaults/SaveCommand.php

@@ -29,7 +29,7 @@ use pocketmine\event\TranslationContainer;
 
 class SaveCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.save.description",

src/pocketmine/command/defaults/SaveOffCommand.php

@@ -29,7 +29,7 @@ use pocketmine\event\TranslationContainer;
 
 class SaveOffCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.saveoff.description",

src/pocketmine/command/defaults/SaveOnCommand.php

@@ -29,7 +29,7 @@ use pocketmine\event\TranslationContainer;
 
 class SaveOnCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.saveon.description",

src/pocketmine/command/defaults/SayCommand.php

@@ -32,7 +32,7 @@ use pocketmine\utils\TextFormat;
 
 class SayCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.say.description",

src/pocketmine/command/defaults/SeedCommand.php

@@ -29,7 +29,7 @@ use pocketmine\Player;
 
 class SeedCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.seed.description",

src/pocketmine/command/defaults/SetWorldSpawnCommand.php

@@ -33,7 +33,7 @@ use pocketmine\utils\TextFormat;
 
 class SetWorldSpawnCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.setworldspawn.description",

src/pocketmine/command/defaults/SpawnpointCommand.php

@@ -34,7 +34,7 @@ use pocketmine\utils\TextFormat;
 
 class SpawnpointCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.spawnpoint.description",

src/pocketmine/command/defaults/StatusCommand.php

@@ -29,7 +29,7 @@ use pocketmine\utils\Utils;
 
 class StatusCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.status.description",

src/pocketmine/command/defaults/StopCommand.php

@@ -29,7 +29,7 @@ use pocketmine\event\TranslationContainer;
 
 class StopCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.stop.description",

src/pocketmine/command/defaults/TeleportCommand.php

@@ -33,7 +33,7 @@ use pocketmine\utils\TextFormat;
 
 class TeleportCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.tp.description",

src/pocketmine/command/defaults/TellCommand.php

@@ -31,7 +31,7 @@ use pocketmine\utils\TextFormat;
 
 class TellCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.tell.description",

src/pocketmine/command/defaults/TimeCommand.php

@@ -33,7 +33,7 @@ use pocketmine\utils\TextFormat;
 
 class TimeCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.time.description",

src/pocketmine/command/defaults/TimingsCommand.php

@@ -35,7 +35,7 @@ class TimingsCommand extends VanillaCommand{
 
 	public static $timingStart = 0;
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.timings.description",

src/pocketmine/command/defaults/TitleCommand.php

@@ -29,7 +29,7 @@ use pocketmine\event\TranslationContainer;
 
 class TitleCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.title.description",

src/pocketmine/command/defaults/TransferServerCommand.php

@@ -31,7 +31,7 @@ use pocketmine\Player;
 
 class TransferServerCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.transferserver.description",

src/pocketmine/command/defaults/VanillaCommand.php

@@ -30,11 +30,15 @@ abstract class VanillaCommand extends Command{
 	const MAX_COORD = 30000000;
 	const MIN_COORD = -30000000;
 
-	public function __construct($name, $description = "", $usageMessage = null, array $aliases = []){
+	/**
-		parent::__construct($name, $description, $usageMessage, $aliases);
+	 * @param CommandSender $sender
-	}
+	 * @param mixed         $value
-
+	 * @param int           $min
-	protected function getInteger(CommandSender $sender, $value, $min = self::MIN_COORD, $max = self::MAX_COORD){
+	 * @param int           $max
+	 *
+	 * @return int
+	 */
+	protected function getInteger(CommandSender $sender, $value, int $min = self::MIN_COORD, int $max = self::MAX_COORD) : int{
 		$i = (int) $value;
 
 		if($i < $min){
@@ -46,7 +50,16 @@ abstract class VanillaCommand extends Command{
 		return $i;
 	}
 
-	protected function getRelativeDouble($original, CommandSender $sender, $input, $min = self::MIN_COORD, $max = self::MAX_COORD){
+	/**
+	 * @param float         $original
+	 * @param CommandSender $sender
+	 * @param string        $input
+	 * @param float         $min
+	 * @param float         $max
+	 *
+	 * @return float
+	 */
+	protected function getRelativeDouble(float $original, CommandSender $sender, string $input, float $min = self::MIN_COORD, float $max = self::MAX_COORD) : float{
 		if($input{0} === "~"){
 			$value = $this->getDouble($sender, substr($input, 1));
 
@@ -56,7 +69,15 @@ abstract class VanillaCommand extends Command{
 		return $this->getDouble($sender, $input, $min, $max);
 	}
 
-	protected function getDouble(CommandSender $sender, $value, $min = self::MIN_COORD, $max = self::MAX_COORD){
+	/**
+	 * @param CommandSender $sender
+	 * @param mixed         $value
+	 * @param float         $min
+	 * @param float         $max
+	 *
+	 * @return float
+	 */
+	protected function getDouble(CommandSender $sender, $value, float $min = self::MIN_COORD, float $max = self::MAX_COORD) : float{
 		$i = (double) $value;
 
 		if($i < $min){

src/pocketmine/command/defaults/VersionCommand.php

@@ -31,7 +31,7 @@ use pocketmine\utils\TextFormat;
 
 class VersionCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.version.description",

src/pocketmine/command/defaults/WhitelistCommand.php

@@ -31,7 +31,7 @@ use pocketmine\utils\TextFormat;
 
 class WhitelistCommand extends VanillaCommand{
 
-	public function __construct($name){
+	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"%pocketmine.command.whitelist.description",
@@ -108,7 +108,7 @@ class WhitelistCommand extends VanillaCommand{
 		return true;
 	}
 
-	private function badPerm(CommandSender $sender, $perm){
+	private function badPerm(CommandSender $sender, string $perm) : bool{
 		if(!$sender->hasPermission("pocketmine.command.whitelist.$perm")){
 			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.permission"));
 

src/pocketmine/entity/Effect.php

@@ -337,19 +337,19 @@ class Effect{
 			case Effect::POISON:
 				if($entity->getHealth() > 1){
 					$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_MAGIC, 1);
-					$entity->attack($ev->getFinalDamage(), $ev);
+					$entity->attack($ev);
 				}
 				break;
 
 			case Effect::WITHER:
 				$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_MAGIC, 1);
-				$entity->attack($ev->getFinalDamage(), $ev);
+				$entity->attack($ev);
 				break;
 
 			case Effect::REGENERATION:
 				if($entity->getHealth() < $entity->getMaxHealth()){
 					$ev = new EntityRegainHealthEvent($entity, 1, EntityRegainHealthEvent::CAUSE_MAGIC);
-					$entity->heal($ev->getAmount(), $ev);
+					$entity->heal($ev);
 				}
 				break;
 
@@ -362,13 +362,13 @@ class Effect{
 				//TODO: add particles (witch spell)
 				if($entity->getHealth() < $entity->getMaxHealth()){
 					$amount = 2 * (2 ** ($this->getEffectLevel() % 32));
-					$entity->heal($amount, new EntityRegainHealthEvent($entity, $amount, EntityRegainHealthEvent::CAUSE_MAGIC));
+					$entity->heal(new EntityRegainHealthEvent($entity, $amount, EntityRegainHealthEvent::CAUSE_MAGIC));
 				}
 				break;
 			case Effect::INSTANT_DAMAGE:
 				//TODO: add particles (witch spell)
 				$amount = 2 * (2 ** ($this->getEffectLevel() % 32));
-				$entity->attack($amount, new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_MAGIC, $amount));
+				$entity->attack(new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_MAGIC, $amount));
 				break;
 		}
 	}

src/pocketmine/entity/Entity.php

@@ -890,11 +890,9 @@ abstract class Entity extends Location implements Metadatable{
 	}
 
 	/**
-	 * @param float             $damage
 	 * @param EntityDamageEvent $source
-	 *
 	 */
-	public function attack($damage, EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source){
 		$this->server->getPluginManager()->callEvent($source);
 		if($source->isCancelled()){
 			return;
@@ -920,11 +918,9 @@ abstract class Entity extends Location implements Metadatable{
 	}
 
 	/**
-	 * @param float                   $amount
 	 * @param EntityRegainHealthEvent $source
-	 *
 	 */
-	public function heal($amount, EntityRegainHealthEvent $source){
+	public function heal(EntityRegainHealthEvent $source){
 		$this->server->getPluginManager()->callEvent($source);
 		if($source->isCancelled()){
 			return;
@@ -1108,7 +1104,6 @@ abstract class Entity extends Location implements Metadatable{
 	public function entityBaseTick(int $tickDiff = 1) : bool{
 		//TODO: check vehicles
 
-		$this->blocksAround = null;
 		$this->justCreated = false;
 
 		if(!$this->isAlive()){
@@ -1132,7 +1127,7 @@ abstract class Entity extends Location implements Metadatable{
 
 		if($this->y <= -16 and $this->isAlive()){
 			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10);
-			$this->attack($ev->getFinalDamage(), $ev);
+			$this->attack($ev);
 			$hasUpdate = true;
 		}
 
@@ -1180,7 +1175,7 @@ abstract class Entity extends Location implements Metadatable{
 	 */
 	protected function dealFireDamage(){
 		$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FIRE_TICK, 1);
-		$this->attack($ev->getFinalDamage(), $ev);
+		$this->attack($ev);
 	}
 
 	protected function updateMovement(){
@@ -1347,6 +1342,8 @@ abstract class Entity extends Location implements Metadatable{
 	final public function setForceMovementUpdate(bool $value = true){
 		$this->forceMovementUpdate = $value;
 		$this->onGround = false;
+
+		$this->blocksAround = null;
 	}
 
 	/**
@@ -1507,6 +1504,8 @@ abstract class Entity extends Location implements Metadatable{
 	}
 
 	public function fastMove(float $dx, float $dy, float $dz) : bool{
+		$this->blocksAround = null;
+
 		if($dx == 0 and $dz == 0 and $dy == 0){
 			return true;
 		}
@@ -1546,13 +1545,12 @@ abstract class Entity extends Location implements Metadatable{
 	}
 
 	public function move(float $dx, float $dy, float $dz) : bool{
+		$this->blocksAround = null;
 
 		if($dx == 0 and $dz == 0 and $dy == 0){
 			return true;
 		}
 
-		$this->blocksAround = null;
-
 		if($this->keepMovement){
 			$this->boundingBox->offset($dx, $dy, $dz);
 			$this->setPosition($this->temporalVector->setComponents(($this->boundingBox->minX + $this->boundingBox->maxX) / 2, $this->boundingBox->minY, ($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2));

src/pocketmine/entity/FallingSand.php

@@ -27,6 +27,7 @@ use pocketmine\block\BlockFactory;
 use pocketmine\event\entity\EntityBlockChangeEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item as ItemItem;
+use pocketmine\item\ItemFactory;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\ByteTag;
 use pocketmine\nbt\tag\IntTag;
@@ -74,9 +75,9 @@ class FallingSand extends Entity{
 		return false;
 	}
 
-	public function attack($damage, EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source){
 		if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
-			parent::attack($damage, $source);
+			parent::attack($source);
 		}
 	}
 
@@ -95,7 +96,7 @@ class FallingSand extends Entity{
 				$block = $this->level->getBlock($pos);
 				if($block->getId() > 0 and $block->isTransparent() and !$block->canBeReplaced()){
 					//FIXME: anvils are supposed to destroy torches
-					$this->getLevel()->dropItem($this, ItemItem::get($this->getBlock(), $this->getDamage(), 1));
+					$this->getLevel()->dropItem($this, ItemFactory::get($this->getBlock(), $this->getDamage(), 1));
 				}else{
 					$this->server->getPluginManager()->callEvent($ev = new EntityBlockChangeEvent($this, $block, BlockFactory::get($this->getBlock(), $this->getDamage())));
 					if(!$ev->isCancelled()){

src/pocketmine/entity/Human.php

@@ -405,19 +405,19 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 					$this->addFood(1.0);
 				}
 				if($this->foodTickTimer % 20 === 0 and $health < $this->getMaxHealth()){
-					$this->heal(1, new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION));
+					$this->heal(new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION));
 				}
 			}
 
 			if($this->foodTickTimer === 0){
 				if($food >= 18){
 					if($health < $this->getMaxHealth()){
-						$this->heal(1, new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION));
+						$this->heal(new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION));
 						$this->exhaust(3.0, PlayerExhaustEvent::CAUSE_HEALTH_REGEN);
 					}
 				}elseif($food <= 0){
 					if(($difficulty === 1 and $health > 10) or ($difficulty === 2 and $health > 1) or $difficulty === 3){
-						$this->attack(1, new EntityDamageEvent($this, EntityDamageEvent::CAUSE_STARVATION, 1));
+						$this->attack(new EntityDamageEvent($this, EntityDamageEvent::CAUSE_STARVATION, 1));
 					}
 				}
 			}

src/pocketmine/entity/Item.php

@@ -87,14 +87,14 @@ class Item extends Entity{
 		$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
 	}
 
-	public function attack($damage, EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source){
 		if(
 			$source->getCause() === EntityDamageEvent::CAUSE_VOID or
 			$source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK or
 			$source->getCause() === EntityDamageEvent::CAUSE_ENTITY_EXPLOSION or
 			$source->getCause() === EntityDamageEvent::CAUSE_BLOCK_EXPLOSION
 		){
-			parent::attack($damage, $source);
+			parent::attack($source);
 		}
 	}
 

src/pocketmine/entity/Living.php

@@ -157,8 +157,8 @@ abstract class Living extends Entity implements Damageable{
 		//return $this->getLevel()->rayTraceBlocks(Vector3::createVector($this->x, $this->y + $this->height, $this->z), Vector3::createVector($entity->x, $entity->y + $entity->height, $entity->z)) === null;
 	}
 
-	public function heal($amount, EntityRegainHealthEvent $source){
+	public function heal(EntityRegainHealthEvent $source){
-		parent::heal($amount, $source);
+		parent::heal($source);
 		if($source->isCancelled()){
 			return;
 		}
@@ -321,14 +321,14 @@ abstract class Living extends Entity implements Damageable{
 		$damage = floor($fallDistance - 3 - ($this->hasEffect(Effect::JUMP) ? $this->getEffect(Effect::JUMP)->getEffectLevel() : 0));
 		if($damage > 0){
 			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage);
-			$this->attack($ev->getFinalDamage(), $ev);
+			$this->attack($ev);
 		}
 	}
 
-	public function attack($damage, EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source){
 		if($this->attackTime > 0 or $this->noDamageTicks > 0){
 			$lastCause = $this->getLastDamageCause();
-			if($lastCause !== null and $lastCause->getDamage() >= $damage){
+			if($lastCause !== null and $lastCause->getDamage() >= $source->getDamage()){
 				$source->setCancelled();
 			}
 		}
@@ -346,7 +346,7 @@ abstract class Living extends Entity implements Damageable{
 			$source->setDamage(-($source->getDamage(EntityDamageEvent::MODIFIER_BASE) * 0.20 * $this->getEffect(Effect::DAMAGE_RESISTANCE)->getEffectLevel()), EntityDamageEvent::MODIFIER_RESISTANCE);
 		}
 
-		parent::attack($damage, $source);
+		parent::attack($source);
 
 		if($source->isCancelled()){
 			return;
@@ -365,7 +365,7 @@ abstract class Living extends Entity implements Damageable{
 
 				$deltaX = $this->x - $e->x;
 				$deltaZ = $this->z - $e->z;
-				$this->knockBack($e, $damage, $deltaX, $deltaZ, $source->getKnockBack());
+				$this->knockBack($e, $source->getDamage(), $deltaX, $deltaZ, $source->getKnockBack());
 			}
 		}
 
@@ -428,7 +428,7 @@ abstract class Living extends Entity implements Damageable{
 			if($this->isInsideOfSolid()){
 				$hasUpdate = true;
 				$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 1);
-				$this->attack($ev->getFinalDamage(), $ev);
+				$this->attack($ev);
 			}
 
 			if(!$this->hasEffect(Effect::WATER_BREATHING) and $this->isInsideOfWater()){
@@ -441,7 +441,7 @@ abstract class Living extends Entity implements Damageable{
 						$airTicks = 0;
 
 						$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_DROWNING, 2);
-						$this->attack($ev->getFinalDamage(), $ev);
+						$this->attack($ev);
 					}
 					$this->setDataProperty(self::DATA_AIR, self::DATA_TYPE_SHORT, $airTicks);
 				}
@@ -453,7 +453,7 @@ abstract class Living extends Entity implements Damageable{
 						$airTicks = 0;
 
 						$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 2);
-						$this->attack($ev->getFinalDamage(), $ev);
+						$this->attack($ev);
 					}
 					$this->setDataProperty(self::DATA_AIR, self::DATA_TYPE_SHORT, $airTicks);
 				}else{

src/pocketmine/entity/PrimedTNT.php

@@ -48,9 +48,9 @@ class PrimedTNT extends Entity implements Explosive{
 	public $canCollide = false;
 
 
-	public function attack($damage, EntityDamageEvent $source){
+	public function attack(EntityDamageEvent $source){
 		if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
-			parent::attack($damage, $source);
+			parent::attack($source);
 		}
 	}