From f7f06c993d908b714feb3b10dd92a1f5b0bcad2b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 16 Sep 2018 14:10:40 +0100 Subject: [PATCH] Make block constructors not write to this->meta directly --- src/pocketmine/block/Air.php | 2 +- src/pocketmine/block/Anvil.php | 2 +- src/pocketmine/block/BaseRail.php | 2 +- src/pocketmine/block/Bed.php | 2 +- src/pocketmine/block/Bedrock.php | 2 +- src/pocketmine/block/Beetroot.php | 2 +- src/pocketmine/block/BoneBlock.php | 2 +- src/pocketmine/block/Bookshelf.php | 2 +- src/pocketmine/block/BrewingStand.php | 2 +- src/pocketmine/block/BrickStairs.php | 2 +- src/pocketmine/block/Bricks.php | 2 +- src/pocketmine/block/BurningFurnace.php | 2 +- src/pocketmine/block/Button.php | 2 +- src/pocketmine/block/Cactus.php | 2 +- src/pocketmine/block/Cake.php | 2 +- src/pocketmine/block/Carpet.php | 2 +- src/pocketmine/block/Carrot.php | 2 +- src/pocketmine/block/Chest.php | 2 +- src/pocketmine/block/Clay.php | 2 +- src/pocketmine/block/Coal.php | 2 +- src/pocketmine/block/CoalOre.php | 2 +- src/pocketmine/block/Cobblestone.php | 2 +- src/pocketmine/block/CobblestoneStairs.php | 2 +- src/pocketmine/block/CobblestoneWall.php | 2 +- src/pocketmine/block/Cobweb.php | 2 +- src/pocketmine/block/CocoaBlock.php | 2 +- src/pocketmine/block/Concrete.php | 2 +- src/pocketmine/block/ConcretePowder.php | 2 +- src/pocketmine/block/CraftingTable.php | 2 +- src/pocketmine/block/Dandelion.php | 2 +- src/pocketmine/block/DaylightSensor.php | 2 +- src/pocketmine/block/DeadBush.php | 2 +- src/pocketmine/block/Diamond.php | 2 +- src/pocketmine/block/DiamondOre.php | 2 +- src/pocketmine/block/Dirt.php | 2 +- src/pocketmine/block/DoublePlant.php | 2 +- src/pocketmine/block/DoubleSlab.php | 2 +- src/pocketmine/block/Emerald.php | 2 +- src/pocketmine/block/EmeraldOre.php | 2 +- src/pocketmine/block/EnchantingTable.php | 2 +- src/pocketmine/block/EndPortalFrame.php | 2 +- src/pocketmine/block/EndRod.php | 2 +- src/pocketmine/block/EndStone.php | 2 +- src/pocketmine/block/EndStoneBricks.php | 2 +- src/pocketmine/block/Farmland.php | 2 +- src/pocketmine/block/Fence.php | 2 +- src/pocketmine/block/Fire.php | 2 +- src/pocketmine/block/Flower.php | 2 +- src/pocketmine/block/FlowerPot.php | 2 +- src/pocketmine/block/Glass.php | 2 +- src/pocketmine/block/GlassPane.php | 2 +- src/pocketmine/block/GlowingObsidian.php | 2 +- src/pocketmine/block/Glowstone.php | 2 +- src/pocketmine/block/Gold.php | 2 +- src/pocketmine/block/GoldOre.php | 2 +- src/pocketmine/block/Grass.php | 2 +- src/pocketmine/block/GrassPath.php | 2 +- src/pocketmine/block/Gravel.php | 2 +- src/pocketmine/block/HardenedClay.php | 2 +- src/pocketmine/block/HayBale.php | 2 +- src/pocketmine/block/Ice.php | 2 +- src/pocketmine/block/Iron.php | 2 +- src/pocketmine/block/IronBars.php | 2 +- src/pocketmine/block/IronDoor.php | 2 +- src/pocketmine/block/IronOre.php | 2 +- src/pocketmine/block/ItemFrame.php | 2 +- src/pocketmine/block/Ladder.php | 2 +- src/pocketmine/block/Lapis.php | 2 +- src/pocketmine/block/LapisOre.php | 2 +- src/pocketmine/block/Lava.php | 2 +- src/pocketmine/block/Leaves.php | 2 +- src/pocketmine/block/Lever.php | 2 +- src/pocketmine/block/Magma.php | 2 +- src/pocketmine/block/Melon.php | 2 +- src/pocketmine/block/MelonStem.php | 2 +- src/pocketmine/block/MonsterSpawner.php | 2 +- src/pocketmine/block/Mycelium.php | 2 +- src/pocketmine/block/NetherBrickStairs.php | 2 +- src/pocketmine/block/NetherQuartzOre.php | 2 +- src/pocketmine/block/NetherReactor.php | 2 +- src/pocketmine/block/NetherWartBlock.php | 2 +- src/pocketmine/block/NetherWartPlant.php | 2 +- src/pocketmine/block/Netherrack.php | 2 +- src/pocketmine/block/NoteBlock.php | 2 +- src/pocketmine/block/Obsidian.php | 2 +- src/pocketmine/block/PackedIce.php | 2 +- src/pocketmine/block/Planks.php | 2 +- src/pocketmine/block/Podzol.php | 2 +- src/pocketmine/block/Potato.php | 2 +- src/pocketmine/block/Prismarine.php | 2 +- src/pocketmine/block/Pumpkin.php | 2 +- src/pocketmine/block/PumpkinStem.php | 2 +- src/pocketmine/block/PurpurStairs.php | 2 +- src/pocketmine/block/Quartz.php | 2 +- src/pocketmine/block/QuartzStairs.php | 2 +- src/pocketmine/block/RedMushroom.php | 2 +- src/pocketmine/block/RedMushroomBlock.php | 2 +- src/pocketmine/block/Redstone.php | 2 +- src/pocketmine/block/RedstoneLamp.php | 2 +- src/pocketmine/block/RedstoneOre.php | 2 +- src/pocketmine/block/Sand.php | 2 +- src/pocketmine/block/Sandstone.php | 2 +- src/pocketmine/block/SandstoneStairs.php | 2 +- src/pocketmine/block/Sapling.php | 2 +- src/pocketmine/block/SeaLantern.php | 2 +- src/pocketmine/block/SignPost.php | 2 +- src/pocketmine/block/Skull.php | 2 +- src/pocketmine/block/Slab.php | 2 +- src/pocketmine/block/Snow.php | 2 +- src/pocketmine/block/SnowLayer.php | 2 +- src/pocketmine/block/SoulSand.php | 2 +- src/pocketmine/block/Sponge.php | 2 +- src/pocketmine/block/StandingBanner.php | 2 +- src/pocketmine/block/Stone.php | 2 +- src/pocketmine/block/StoneBrickStairs.php | 2 +- src/pocketmine/block/StoneBricks.php | 2 +- src/pocketmine/block/StonePressurePlate.php | 2 +- src/pocketmine/block/Stonecutter.php | 2 +- src/pocketmine/block/Sugarcane.php | 2 +- src/pocketmine/block/TNT.php | 2 +- src/pocketmine/block/TallGrass.php | 2 +- src/pocketmine/block/Torch.php | 2 +- src/pocketmine/block/Trapdoor.php | 2 +- src/pocketmine/block/Tripwire.php | 2 +- src/pocketmine/block/TripwireHook.php | 2 +- src/pocketmine/block/Vine.php | 2 +- src/pocketmine/block/Water.php | 2 +- src/pocketmine/block/WaterLily.php | 2 +- src/pocketmine/block/WeightedPressurePlateLight.php | 2 +- src/pocketmine/block/Wheat.php | 2 +- src/pocketmine/block/Wood.php | 2 +- src/pocketmine/block/Wool.php | 2 +- 132 files changed, 132 insertions(+), 132 deletions(-) diff --git a/src/pocketmine/block/Air.php b/src/pocketmine/block/Air.php index b953eb906..9984e3fe2 100644 --- a/src/pocketmine/block/Air.php +++ b/src/pocketmine/block/Air.php @@ -35,7 +35,7 @@ class Air extends Transparent{ protected $id = self::AIR; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index fb9019f96..7f8bf54fa 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -40,7 +40,7 @@ class Anvil extends Fallable{ protected $id = self::ANVIL; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function isTransparent() : bool{ diff --git a/src/pocketmine/block/BaseRail.php b/src/pocketmine/block/BaseRail.php index bfcdf32ca..d7a2096b9 100644 --- a/src/pocketmine/block/BaseRail.php +++ b/src/pocketmine/block/BaseRail.php @@ -77,7 +77,7 @@ abstract class BaseRail extends Flowable{ ]; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Bed.php b/src/pocketmine/block/Bed.php index e802482eb..f6ee877c5 100644 --- a/src/pocketmine/block/Bed.php +++ b/src/pocketmine/block/Bed.php @@ -45,7 +45,7 @@ class Bed extends Transparent{ protected $itemId = Item::BED; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Bedrock.php b/src/pocketmine/block/Bedrock.php index beb5ceac1..403fc495d 100644 --- a/src/pocketmine/block/Bedrock.php +++ b/src/pocketmine/block/Bedrock.php @@ -30,7 +30,7 @@ class Bedrock extends Solid{ protected $id = self::BEDROCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Beetroot.php b/src/pocketmine/block/Beetroot.php index a6cc04752..783fe6e09 100644 --- a/src/pocketmine/block/Beetroot.php +++ b/src/pocketmine/block/Beetroot.php @@ -31,7 +31,7 @@ class Beetroot extends Crops{ protected $id = self::BEETROOT_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/BoneBlock.php b/src/pocketmine/block/BoneBlock.php index 7d9efaceb..1eb7e11f5 100644 --- a/src/pocketmine/block/BoneBlock.php +++ b/src/pocketmine/block/BoneBlock.php @@ -34,7 +34,7 @@ class BoneBlock extends Solid{ protected $id = Block::BONE_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Bookshelf.php b/src/pocketmine/block/Bookshelf.php index 601f39610..3ae90a3ed 100644 --- a/src/pocketmine/block/Bookshelf.php +++ b/src/pocketmine/block/Bookshelf.php @@ -31,7 +31,7 @@ class Bookshelf extends Solid{ protected $id = self::BOOKSHELF; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/BrewingStand.php b/src/pocketmine/block/BrewingStand.php index c2ad6f948..b5443a877 100644 --- a/src/pocketmine/block/BrewingStand.php +++ b/src/pocketmine/block/BrewingStand.php @@ -30,7 +30,7 @@ class BrewingStand extends Transparent{ protected $id = self::BREWING_STAND_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/BrickStairs.php b/src/pocketmine/block/BrickStairs.php index 4e305e955..490c2697f 100644 --- a/src/pocketmine/block/BrickStairs.php +++ b/src/pocketmine/block/BrickStairs.php @@ -30,7 +30,7 @@ class BrickStairs extends Stair{ protected $id = self::BRICK_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Bricks.php b/src/pocketmine/block/Bricks.php index 22f0c1fc7..f18963ca1 100644 --- a/src/pocketmine/block/Bricks.php +++ b/src/pocketmine/block/Bricks.php @@ -30,7 +30,7 @@ class Bricks extends Solid{ protected $id = self::BRICK_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/BurningFurnace.php b/src/pocketmine/block/BurningFurnace.php index 7440d0f28..3cc32970f 100644 --- a/src/pocketmine/block/BurningFurnace.php +++ b/src/pocketmine/block/BurningFurnace.php @@ -38,7 +38,7 @@ class BurningFurnace extends Solid{ protected $itemId = self::FURNACE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Button.php b/src/pocketmine/block/Button.php index d8b333e82..2c1dbaf58 100644 --- a/src/pocketmine/block/Button.php +++ b/src/pocketmine/block/Button.php @@ -30,7 +30,7 @@ use pocketmine\Player; abstract class Button extends Flowable{ public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getVariantBitmask() : int{ diff --git a/src/pocketmine/block/Cactus.php b/src/pocketmine/block/Cactus.php index 19fbff904..fcf5c4a56 100644 --- a/src/pocketmine/block/Cactus.php +++ b/src/pocketmine/block/Cactus.php @@ -39,7 +39,7 @@ class Cactus extends Transparent{ protected $id = self::CACTUS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Cake.php b/src/pocketmine/block/Cake.php index dd31ec231..970a073ef 100644 --- a/src/pocketmine/block/Cake.php +++ b/src/pocketmine/block/Cake.php @@ -37,7 +37,7 @@ class Cake extends Transparent implements FoodSource{ protected $id = self::CAKE_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Carpet.php b/src/pocketmine/block/Carpet.php index a79dac092..92310cc33 100644 --- a/src/pocketmine/block/Carpet.php +++ b/src/pocketmine/block/Carpet.php @@ -35,7 +35,7 @@ class Carpet extends Flowable{ protected $id = self::CARPET; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Carrot.php b/src/pocketmine/block/Carrot.php index 42f6133f2..9ca50c224 100644 --- a/src/pocketmine/block/Carrot.php +++ b/src/pocketmine/block/Carrot.php @@ -31,7 +31,7 @@ class Carrot extends Crops{ protected $id = self::CARROT_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php index 2ca3536ee..942503bfc 100644 --- a/src/pocketmine/block/Chest.php +++ b/src/pocketmine/block/Chest.php @@ -37,7 +37,7 @@ class Chest extends Transparent{ protected $id = self::CHEST; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Clay.php b/src/pocketmine/block/Clay.php index 12758b802..2fb26fd99 100644 --- a/src/pocketmine/block/Clay.php +++ b/src/pocketmine/block/Clay.php @@ -31,7 +31,7 @@ class Clay extends Solid{ protected $id = self::CLAY_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Coal.php b/src/pocketmine/block/Coal.php index 68ccfe239..eb6f609a1 100644 --- a/src/pocketmine/block/Coal.php +++ b/src/pocketmine/block/Coal.php @@ -30,7 +30,7 @@ class Coal extends Solid{ protected $id = self::COAL_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/CoalOre.php b/src/pocketmine/block/CoalOre.php index 520c2ff71..f440fa2c3 100644 --- a/src/pocketmine/block/CoalOre.php +++ b/src/pocketmine/block/CoalOre.php @@ -32,7 +32,7 @@ class CoalOre extends Solid{ protected $id = self::COAL_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Cobblestone.php b/src/pocketmine/block/Cobblestone.php index 87169fc63..dd9cce576 100644 --- a/src/pocketmine/block/Cobblestone.php +++ b/src/pocketmine/block/Cobblestone.php @@ -30,7 +30,7 @@ class Cobblestone extends Solid{ protected $id = self::COBBLESTONE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getToolType() : int{ diff --git a/src/pocketmine/block/CobblestoneStairs.php b/src/pocketmine/block/CobblestoneStairs.php index 06357dea1..4670b4957 100644 --- a/src/pocketmine/block/CobblestoneStairs.php +++ b/src/pocketmine/block/CobblestoneStairs.php @@ -30,7 +30,7 @@ class CobblestoneStairs extends Stair{ protected $id = self::COBBLESTONE_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/CobblestoneWall.php b/src/pocketmine/block/CobblestoneWall.php index 86c2d977d..0e2ee42f5 100644 --- a/src/pocketmine/block/CobblestoneWall.php +++ b/src/pocketmine/block/CobblestoneWall.php @@ -34,7 +34,7 @@ class CobblestoneWall extends Transparent{ protected $id = self::COBBLESTONE_WALL; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getToolType() : int{ diff --git a/src/pocketmine/block/Cobweb.php b/src/pocketmine/block/Cobweb.php index c20cc35f5..d75ee1cfe 100644 --- a/src/pocketmine/block/Cobweb.php +++ b/src/pocketmine/block/Cobweb.php @@ -32,7 +32,7 @@ class Cobweb extends Flowable{ protected $id = self::COBWEB; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function hasEntityCollision() : bool{ diff --git a/src/pocketmine/block/CocoaBlock.php b/src/pocketmine/block/CocoaBlock.php index fca535a99..663e8f42c 100644 --- a/src/pocketmine/block/CocoaBlock.php +++ b/src/pocketmine/block/CocoaBlock.php @@ -28,7 +28,7 @@ class CocoaBlock extends Transparent{ protected $id = self::COCOA_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Concrete.php b/src/pocketmine/block/Concrete.php index 9148d9f50..42d427a1b 100644 --- a/src/pocketmine/block/Concrete.php +++ b/src/pocketmine/block/Concrete.php @@ -31,7 +31,7 @@ class Concrete extends Solid{ protected $id = Block::CONCRETE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/ConcretePowder.php b/src/pocketmine/block/ConcretePowder.php index 71df53787..a43f688a3 100644 --- a/src/pocketmine/block/ConcretePowder.php +++ b/src/pocketmine/block/ConcretePowder.php @@ -31,7 +31,7 @@ class ConcretePowder extends Fallable{ protected $id = self::CONCRETE_POWDER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/CraftingTable.php b/src/pocketmine/block/CraftingTable.php index 05b52fd6a..a0ce8ce3b 100644 --- a/src/pocketmine/block/CraftingTable.php +++ b/src/pocketmine/block/CraftingTable.php @@ -32,7 +32,7 @@ class CraftingTable extends Solid{ protected $id = self::CRAFTING_TABLE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Dandelion.php b/src/pocketmine/block/Dandelion.php index 474054e72..50b887d93 100644 --- a/src/pocketmine/block/Dandelion.php +++ b/src/pocketmine/block/Dandelion.php @@ -33,7 +33,7 @@ class Dandelion extends Flowable{ protected $id = self::DANDELION; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/DaylightSensor.php b/src/pocketmine/block/DaylightSensor.php index b5381b41a..708667600 100644 --- a/src/pocketmine/block/DaylightSensor.php +++ b/src/pocketmine/block/DaylightSensor.php @@ -28,7 +28,7 @@ class DaylightSensor extends Transparent{ protected $id = self::DAYLIGHT_SENSOR; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/DeadBush.php b/src/pocketmine/block/DeadBush.php index 8f3c5c354..d32afc18c 100644 --- a/src/pocketmine/block/DeadBush.php +++ b/src/pocketmine/block/DeadBush.php @@ -34,7 +34,7 @@ class DeadBush extends Flowable{ protected $id = self::DEAD_BUSH; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Diamond.php b/src/pocketmine/block/Diamond.php index 8deea0468..3a6f66aa7 100644 --- a/src/pocketmine/block/Diamond.php +++ b/src/pocketmine/block/Diamond.php @@ -30,7 +30,7 @@ class Diamond extends Solid{ protected $id = self::DIAMOND_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/DiamondOre.php b/src/pocketmine/block/DiamondOre.php index cde4604e3..a789d9d45 100644 --- a/src/pocketmine/block/DiamondOre.php +++ b/src/pocketmine/block/DiamondOre.php @@ -32,7 +32,7 @@ class DiamondOre extends Solid{ protected $id = self::DIAMOND_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Dirt.php b/src/pocketmine/block/Dirt.php index 96f8da27c..89a4e519d 100644 --- a/src/pocketmine/block/Dirt.php +++ b/src/pocketmine/block/Dirt.php @@ -32,7 +32,7 @@ class Dirt extends Solid{ protected $id = self::DIRT; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/DoublePlant.php b/src/pocketmine/block/DoublePlant.php index f1d477675..1c9317de5 100644 --- a/src/pocketmine/block/DoublePlant.php +++ b/src/pocketmine/block/DoublePlant.php @@ -35,7 +35,7 @@ class DoublePlant extends Flowable{ protected $id = self::DOUBLE_PLANT; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function canBeReplaced() : bool{ diff --git a/src/pocketmine/block/DoubleSlab.php b/src/pocketmine/block/DoubleSlab.php index 31a2ffdcf..668e56615 100644 --- a/src/pocketmine/block/DoubleSlab.php +++ b/src/pocketmine/block/DoubleSlab.php @@ -29,7 +29,7 @@ use pocketmine\item\ItemFactory; abstract class DoubleSlab extends Solid{ public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } abstract public function getSlabId() : int; diff --git a/src/pocketmine/block/Emerald.php b/src/pocketmine/block/Emerald.php index 7c5051051..778d7e817 100644 --- a/src/pocketmine/block/Emerald.php +++ b/src/pocketmine/block/Emerald.php @@ -30,7 +30,7 @@ class Emerald extends Solid{ protected $id = self::EMERALD_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/EmeraldOre.php b/src/pocketmine/block/EmeraldOre.php index 7dcbcde65..31c2a3f80 100644 --- a/src/pocketmine/block/EmeraldOre.php +++ b/src/pocketmine/block/EmeraldOre.php @@ -32,7 +32,7 @@ class EmeraldOre extends Solid{ protected $id = self::EMERALD_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/EnchantingTable.php b/src/pocketmine/block/EnchantingTable.php index f86616bee..4a23b3ab1 100644 --- a/src/pocketmine/block/EnchantingTable.php +++ b/src/pocketmine/block/EnchantingTable.php @@ -36,7 +36,7 @@ class EnchantingTable extends Transparent{ protected $id = self::ENCHANTING_TABLE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{ diff --git a/src/pocketmine/block/EndPortalFrame.php b/src/pocketmine/block/EndPortalFrame.php index 1e51399b6..193788054 100644 --- a/src/pocketmine/block/EndPortalFrame.php +++ b/src/pocketmine/block/EndPortalFrame.php @@ -31,7 +31,7 @@ class EndPortalFrame extends Solid{ protected $id = self::END_PORTAL_FRAME; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getLightLevel() : int{ diff --git a/src/pocketmine/block/EndRod.php b/src/pocketmine/block/EndRod.php index 9aa157670..306cdd266 100644 --- a/src/pocketmine/block/EndRod.php +++ b/src/pocketmine/block/EndRod.php @@ -34,7 +34,7 @@ class EndRod extends Flowable{ protected $id = Block::END_ROD; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/EndStone.php b/src/pocketmine/block/EndStone.php index d7147f8de..cd4f40c7d 100644 --- a/src/pocketmine/block/EndStone.php +++ b/src/pocketmine/block/EndStone.php @@ -30,7 +30,7 @@ class EndStone extends Solid{ protected $id = self::END_STONE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/EndStoneBricks.php b/src/pocketmine/block/EndStoneBricks.php index 87ba1cb29..a925f952c 100644 --- a/src/pocketmine/block/EndStoneBricks.php +++ b/src/pocketmine/block/EndStoneBricks.php @@ -30,7 +30,7 @@ class EndStoneBricks extends Solid{ protected $id = self::END_BRICKS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Farmland.php b/src/pocketmine/block/Farmland.php index b8a32a753..f1895e947 100644 --- a/src/pocketmine/block/Farmland.php +++ b/src/pocketmine/block/Farmland.php @@ -33,7 +33,7 @@ class Farmland extends Transparent{ protected $id = self::FARMLAND; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Fence.php b/src/pocketmine/block/Fence.php index f7981e207..effd3b824 100644 --- a/src/pocketmine/block/Fence.php +++ b/src/pocketmine/block/Fence.php @@ -29,7 +29,7 @@ use pocketmine\math\Facing; abstract class Fence extends Transparent{ public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getThickness() : float{ diff --git a/src/pocketmine/block/Fire.php b/src/pocketmine/block/Fire.php index b8ccc1cf7..a6bd4c1e7 100644 --- a/src/pocketmine/block/Fire.php +++ b/src/pocketmine/block/Fire.php @@ -38,7 +38,7 @@ class Fire extends Flowable{ protected $id = self::FIRE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function hasEntityCollision() : bool{ diff --git a/src/pocketmine/block/Flower.php b/src/pocketmine/block/Flower.php index d19bfa3a2..fb85cbefb 100644 --- a/src/pocketmine/block/Flower.php +++ b/src/pocketmine/block/Flower.php @@ -42,7 +42,7 @@ class Flower extends Flowable{ protected $id = self::RED_FLOWER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php index 8e50621cd..40555546c 100644 --- a/src/pocketmine/block/FlowerPot.php +++ b/src/pocketmine/block/FlowerPot.php @@ -40,7 +40,7 @@ class FlowerPot extends Flowable{ protected $itemId = Item::FLOWER_POT; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Glass.php b/src/pocketmine/block/Glass.php index 42bd5cdd9..65ab80b57 100644 --- a/src/pocketmine/block/Glass.php +++ b/src/pocketmine/block/Glass.php @@ -30,7 +30,7 @@ class Glass extends Transparent{ protected $id = self::GLASS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/GlassPane.php b/src/pocketmine/block/GlassPane.php index c009460af..cc1944067 100644 --- a/src/pocketmine/block/GlassPane.php +++ b/src/pocketmine/block/GlassPane.php @@ -30,7 +30,7 @@ class GlassPane extends Thin{ protected $id = self::GLASS_PANE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/GlowingObsidian.php b/src/pocketmine/block/GlowingObsidian.php index 74c129c21..e8e62a76d 100644 --- a/src/pocketmine/block/GlowingObsidian.php +++ b/src/pocketmine/block/GlowingObsidian.php @@ -31,7 +31,7 @@ class GlowingObsidian extends Solid{ protected $id = self::GLOWING_OBSIDIAN; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Glowstone.php b/src/pocketmine/block/Glowstone.php index caf15beb9..02f5a31ba 100644 --- a/src/pocketmine/block/Glowstone.php +++ b/src/pocketmine/block/Glowstone.php @@ -31,7 +31,7 @@ class Glowstone extends Transparent{ protected $id = self::GLOWSTONE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Gold.php b/src/pocketmine/block/Gold.php index d9b745795..99e82324a 100644 --- a/src/pocketmine/block/Gold.php +++ b/src/pocketmine/block/Gold.php @@ -30,7 +30,7 @@ class Gold extends Solid{ protected $id = self::GOLD_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/GoldOre.php b/src/pocketmine/block/GoldOre.php index a776e01fd..a6b280ccf 100644 --- a/src/pocketmine/block/GoldOre.php +++ b/src/pocketmine/block/GoldOre.php @@ -30,7 +30,7 @@ class GoldOre extends Solid{ protected $id = self::GOLD_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php index 43045355e..641f3118e 100644 --- a/src/pocketmine/block/Grass.php +++ b/src/pocketmine/block/Grass.php @@ -38,7 +38,7 @@ class Grass extends Solid{ protected $id = self::GRASS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/GrassPath.php b/src/pocketmine/block/GrassPath.php index dbe08ca78..18818277f 100644 --- a/src/pocketmine/block/GrassPath.php +++ b/src/pocketmine/block/GrassPath.php @@ -33,7 +33,7 @@ class GrassPath extends Transparent{ protected $id = self::GRASS_PATH; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Gravel.php b/src/pocketmine/block/Gravel.php index 5aced70ce..d2492729b 100644 --- a/src/pocketmine/block/Gravel.php +++ b/src/pocketmine/block/Gravel.php @@ -31,7 +31,7 @@ class Gravel extends Fallable{ protected $id = self::GRAVEL; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/HardenedClay.php b/src/pocketmine/block/HardenedClay.php index 3a3e6896e..7918c2c32 100644 --- a/src/pocketmine/block/HardenedClay.php +++ b/src/pocketmine/block/HardenedClay.php @@ -30,7 +30,7 @@ class HardenedClay extends Solid{ protected $id = self::HARDENED_CLAY; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/HayBale.php b/src/pocketmine/block/HayBale.php index 112f9f788..696c8c8f9 100644 --- a/src/pocketmine/block/HayBale.php +++ b/src/pocketmine/block/HayBale.php @@ -33,7 +33,7 @@ class HayBale extends Solid{ protected $id = self::HAY_BALE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Ice.php b/src/pocketmine/block/Ice.php index b3e33af14..071de1fd4 100644 --- a/src/pocketmine/block/Ice.php +++ b/src/pocketmine/block/Ice.php @@ -32,7 +32,7 @@ class Ice extends Transparent{ protected $id = self::ICE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Iron.php b/src/pocketmine/block/Iron.php index 3f0a0786f..772a8d664 100644 --- a/src/pocketmine/block/Iron.php +++ b/src/pocketmine/block/Iron.php @@ -30,7 +30,7 @@ class Iron extends Solid{ protected $id = self::IRON_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/IronBars.php b/src/pocketmine/block/IronBars.php index 52b4869ce..7e6030f09 100644 --- a/src/pocketmine/block/IronBars.php +++ b/src/pocketmine/block/IronBars.php @@ -30,7 +30,7 @@ class IronBars extends Thin{ protected $id = self::IRON_BARS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/IronDoor.php b/src/pocketmine/block/IronDoor.php index 2d263faed..b097d4d26 100644 --- a/src/pocketmine/block/IronDoor.php +++ b/src/pocketmine/block/IronDoor.php @@ -33,7 +33,7 @@ class IronDoor extends Door{ protected $itemId = Item::IRON_DOOR; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/IronOre.php b/src/pocketmine/block/IronOre.php index 003e8384d..bda7572da 100644 --- a/src/pocketmine/block/IronOre.php +++ b/src/pocketmine/block/IronOre.php @@ -30,7 +30,7 @@ class IronOre extends Solid{ protected $id = self::IRON_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/ItemFrame.php b/src/pocketmine/block/ItemFrame.php index f744d05f3..f8414aed3 100644 --- a/src/pocketmine/block/ItemFrame.php +++ b/src/pocketmine/block/ItemFrame.php @@ -36,7 +36,7 @@ class ItemFrame extends Flowable{ protected $itemId = Item::ITEM_FRAME; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Ladder.php b/src/pocketmine/block/Ladder.php index 0fcbe8217..0f29bcb0c 100644 --- a/src/pocketmine/block/Ladder.php +++ b/src/pocketmine/block/Ladder.php @@ -35,7 +35,7 @@ class Ladder extends Transparent{ protected $id = self::LADDER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Lapis.php b/src/pocketmine/block/Lapis.php index 664a4a4db..3ca5c31b1 100644 --- a/src/pocketmine/block/Lapis.php +++ b/src/pocketmine/block/Lapis.php @@ -30,7 +30,7 @@ class Lapis extends Solid{ protected $id = self::LAPIS_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/LapisOre.php b/src/pocketmine/block/LapisOre.php index c13181cdc..18bccaf98 100644 --- a/src/pocketmine/block/LapisOre.php +++ b/src/pocketmine/block/LapisOre.php @@ -32,7 +32,7 @@ class LapisOre extends Solid{ protected $id = self::LAPIS_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Lava.php b/src/pocketmine/block/Lava.php index 044bc1d9f..7757cd36d 100644 --- a/src/pocketmine/block/Lava.php +++ b/src/pocketmine/block/Lava.php @@ -36,7 +36,7 @@ class Lava extends Liquid{ protected $id = self::FLOWING_LAVA; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getLightLevel() : int{ diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index 9257ca84c..8ad5ae402 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -43,7 +43,7 @@ class Leaves extends Transparent{ protected $woodType = self::WOOD; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Lever.php b/src/pocketmine/block/Lever.php index a57fc1c66..6cd6b8480 100644 --- a/src/pocketmine/block/Lever.php +++ b/src/pocketmine/block/Lever.php @@ -34,7 +34,7 @@ class Lever extends Flowable{ protected $id = self::LEVER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Magma.php b/src/pocketmine/block/Magma.php index 6fae86ae8..725bdfeb8 100644 --- a/src/pocketmine/block/Magma.php +++ b/src/pocketmine/block/Magma.php @@ -33,7 +33,7 @@ class Magma extends Solid{ protected $id = Block::MAGMA; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Melon.php b/src/pocketmine/block/Melon.php index e5023d392..649f839d2 100644 --- a/src/pocketmine/block/Melon.php +++ b/src/pocketmine/block/Melon.php @@ -31,7 +31,7 @@ class Melon extends Transparent{ protected $id = self::MELON_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/MelonStem.php b/src/pocketmine/block/MelonStem.php index 0af36721d..e8763cb2d 100644 --- a/src/pocketmine/block/MelonStem.php +++ b/src/pocketmine/block/MelonStem.php @@ -38,7 +38,7 @@ class MelonStem extends Crops{ } public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function onRandomTick() : void{ diff --git a/src/pocketmine/block/MonsterSpawner.php b/src/pocketmine/block/MonsterSpawner.php index dda589543..4829fd4f8 100644 --- a/src/pocketmine/block/MonsterSpawner.php +++ b/src/pocketmine/block/MonsterSpawner.php @@ -31,7 +31,7 @@ class MonsterSpawner extends Transparent{ protected $id = self::MONSTER_SPAWNER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Mycelium.php b/src/pocketmine/block/Mycelium.php index 331d4ddc7..1c5692a52 100644 --- a/src/pocketmine/block/Mycelium.php +++ b/src/pocketmine/block/Mycelium.php @@ -34,7 +34,7 @@ class Mycelium extends Solid{ protected $id = self::MYCELIUM; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/NetherBrickStairs.php b/src/pocketmine/block/NetherBrickStairs.php index 270256929..190a66e3c 100644 --- a/src/pocketmine/block/NetherBrickStairs.php +++ b/src/pocketmine/block/NetherBrickStairs.php @@ -30,7 +30,7 @@ class NetherBrickStairs extends Stair{ protected $id = self::NETHER_BRICK_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/NetherQuartzOre.php b/src/pocketmine/block/NetherQuartzOre.php index 3726abc02..7280203a5 100644 --- a/src/pocketmine/block/NetherQuartzOre.php +++ b/src/pocketmine/block/NetherQuartzOre.php @@ -32,7 +32,7 @@ class NetherQuartzOre extends Solid{ protected $id = Block::NETHER_QUARTZ_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/NetherReactor.php b/src/pocketmine/block/NetherReactor.php index bf3f924fb..fdaa0cb86 100644 --- a/src/pocketmine/block/NetherReactor.php +++ b/src/pocketmine/block/NetherReactor.php @@ -31,7 +31,7 @@ class NetherReactor extends Solid{ protected $id = Block::NETHER_REACTOR; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/NetherWartBlock.php b/src/pocketmine/block/NetherWartBlock.php index 2758f4ff4..ac960d920 100644 --- a/src/pocketmine/block/NetherWartBlock.php +++ b/src/pocketmine/block/NetherWartBlock.php @@ -28,7 +28,7 @@ class NetherWartBlock extends Solid{ protected $id = Block::NETHER_WART_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/NetherWartPlant.php b/src/pocketmine/block/NetherWartPlant.php index 5c5e25694..50dd5dbbe 100644 --- a/src/pocketmine/block/NetherWartPlant.php +++ b/src/pocketmine/block/NetherWartPlant.php @@ -37,7 +37,7 @@ class NetherWartPlant extends Flowable{ protected $itemId = Item::NETHER_WART; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Netherrack.php b/src/pocketmine/block/Netherrack.php index e89d12f7a..823a6b30c 100644 --- a/src/pocketmine/block/Netherrack.php +++ b/src/pocketmine/block/Netherrack.php @@ -30,7 +30,7 @@ class Netherrack extends Solid{ protected $id = self::NETHERRACK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/NoteBlock.php b/src/pocketmine/block/NoteBlock.php index ca0d3c661..4dc4fe9d4 100644 --- a/src/pocketmine/block/NoteBlock.php +++ b/src/pocketmine/block/NoteBlock.php @@ -28,7 +28,7 @@ class NoteBlock extends Solid{ protected $id = self::NOTE_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Obsidian.php b/src/pocketmine/block/Obsidian.php index 1363b490f..f37298483 100644 --- a/src/pocketmine/block/Obsidian.php +++ b/src/pocketmine/block/Obsidian.php @@ -30,7 +30,7 @@ class Obsidian extends Solid{ protected $id = self::OBSIDIAN; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/PackedIce.php b/src/pocketmine/block/PackedIce.php index 48eb08667..d80c91839 100644 --- a/src/pocketmine/block/PackedIce.php +++ b/src/pocketmine/block/PackedIce.php @@ -28,7 +28,7 @@ class PackedIce extends Solid{ protected $id = self::PACKED_ICE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Planks.php b/src/pocketmine/block/Planks.php index 85de56ea7..9e5efe705 100644 --- a/src/pocketmine/block/Planks.php +++ b/src/pocketmine/block/Planks.php @@ -34,7 +34,7 @@ class Planks extends Solid{ protected $id = self::WOODEN_PLANKS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Podzol.php b/src/pocketmine/block/Podzol.php index 1ad8406cf..470c8fabd 100644 --- a/src/pocketmine/block/Podzol.php +++ b/src/pocketmine/block/Podzol.php @@ -28,7 +28,7 @@ class Podzol extends Solid{ protected $id = self::PODZOL; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getToolType() : int{ diff --git a/src/pocketmine/block/Potato.php b/src/pocketmine/block/Potato.php index 6df545d30..87d0efa2d 100644 --- a/src/pocketmine/block/Potato.php +++ b/src/pocketmine/block/Potato.php @@ -31,7 +31,7 @@ class Potato extends Crops{ protected $id = self::POTATO_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Prismarine.php b/src/pocketmine/block/Prismarine.php index 61de1b3b3..42a3fad71 100644 --- a/src/pocketmine/block/Prismarine.php +++ b/src/pocketmine/block/Prismarine.php @@ -34,7 +34,7 @@ class Prismarine extends Solid{ protected $id = self::PRISMARINE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Pumpkin.php b/src/pocketmine/block/Pumpkin.php index 3c63bae35..598114b1e 100644 --- a/src/pocketmine/block/Pumpkin.php +++ b/src/pocketmine/block/Pumpkin.php @@ -28,7 +28,7 @@ class Pumpkin extends Solid{ protected $id = self::PUMPKIN; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/PumpkinStem.php b/src/pocketmine/block/PumpkinStem.php index de5b480ba..dba366297 100644 --- a/src/pocketmine/block/PumpkinStem.php +++ b/src/pocketmine/block/PumpkinStem.php @@ -34,7 +34,7 @@ class PumpkinStem extends Crops{ protected $id = self::PUMPKIN_STEM; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/PurpurStairs.php b/src/pocketmine/block/PurpurStairs.php index 39b3ace26..4e21183c5 100644 --- a/src/pocketmine/block/PurpurStairs.php +++ b/src/pocketmine/block/PurpurStairs.php @@ -30,7 +30,7 @@ class PurpurStairs extends Stair{ protected $id = self::PURPUR_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Quartz.php b/src/pocketmine/block/Quartz.php index dbda5ca3c..162191d9e 100644 --- a/src/pocketmine/block/Quartz.php +++ b/src/pocketmine/block/Quartz.php @@ -38,7 +38,7 @@ class Quartz extends Solid{ protected $id = self::QUARTZ_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/QuartzStairs.php b/src/pocketmine/block/QuartzStairs.php index 9ef08373d..e748ca385 100644 --- a/src/pocketmine/block/QuartzStairs.php +++ b/src/pocketmine/block/QuartzStairs.php @@ -30,7 +30,7 @@ class QuartzStairs extends Stair{ protected $id = self::QUARTZ_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/RedMushroom.php b/src/pocketmine/block/RedMushroom.php index 6a4b9118f..1ed607697 100644 --- a/src/pocketmine/block/RedMushroom.php +++ b/src/pocketmine/block/RedMushroom.php @@ -33,7 +33,7 @@ class RedMushroom extends Flowable{ protected $id = self::RED_MUSHROOM; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/RedMushroomBlock.php b/src/pocketmine/block/RedMushroomBlock.php index 94e1f45f3..f89213867 100644 --- a/src/pocketmine/block/RedMushroomBlock.php +++ b/src/pocketmine/block/RedMushroomBlock.php @@ -30,7 +30,7 @@ class RedMushroomBlock extends Solid{ protected $id = Block::RED_MUSHROOM_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Redstone.php b/src/pocketmine/block/Redstone.php index cdeb98fe7..7430138c9 100644 --- a/src/pocketmine/block/Redstone.php +++ b/src/pocketmine/block/Redstone.php @@ -30,7 +30,7 @@ class Redstone extends Solid{ protected $id = self::REDSTONE_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/RedstoneLamp.php b/src/pocketmine/block/RedstoneLamp.php index a90e944f9..8a33c6e94 100644 --- a/src/pocketmine/block/RedstoneLamp.php +++ b/src/pocketmine/block/RedstoneLamp.php @@ -28,7 +28,7 @@ class RedstoneLamp extends Solid{ protected $id = self::REDSTONE_LAMP; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/RedstoneOre.php b/src/pocketmine/block/RedstoneOre.php index 22b8aa739..a16e48cd4 100644 --- a/src/pocketmine/block/RedstoneOre.php +++ b/src/pocketmine/block/RedstoneOre.php @@ -34,7 +34,7 @@ class RedstoneOre extends Solid{ protected $id = self::REDSTONE_ORE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Sand.php b/src/pocketmine/block/Sand.php index bd98b47b1..3bd4294ff 100644 --- a/src/pocketmine/block/Sand.php +++ b/src/pocketmine/block/Sand.php @@ -28,7 +28,7 @@ class Sand extends Fallable{ protected $id = self::SAND; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Sandstone.php b/src/pocketmine/block/Sandstone.php index 5c941c319..d7b829801 100644 --- a/src/pocketmine/block/Sandstone.php +++ b/src/pocketmine/block/Sandstone.php @@ -34,7 +34,7 @@ class Sandstone extends Solid{ protected $id = self::SANDSTONE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/SandstoneStairs.php b/src/pocketmine/block/SandstoneStairs.php index 7c73e6147..4bdc87b7f 100644 --- a/src/pocketmine/block/SandstoneStairs.php +++ b/src/pocketmine/block/SandstoneStairs.php @@ -30,7 +30,7 @@ class SandstoneStairs extends Stair{ protected $id = self::SANDSTONE_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index 1573f6321..8c9db99e9 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -41,7 +41,7 @@ class Sapling extends Flowable{ protected $id = self::SAPLING; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/SeaLantern.php b/src/pocketmine/block/SeaLantern.php index 86af6679d..5fcaa87f0 100644 --- a/src/pocketmine/block/SeaLantern.php +++ b/src/pocketmine/block/SeaLantern.php @@ -31,7 +31,7 @@ class SeaLantern extends Transparent{ protected $id = self::SEA_LANTERN; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/SignPost.php b/src/pocketmine/block/SignPost.php index 948c77ed1..87e47aea7 100644 --- a/src/pocketmine/block/SignPost.php +++ b/src/pocketmine/block/SignPost.php @@ -38,7 +38,7 @@ class SignPost extends Transparent{ protected $itemId = Item::SIGN; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Skull.php b/src/pocketmine/block/Skull.php index fe7c63a1c..3f4dc71c2 100644 --- a/src/pocketmine/block/Skull.php +++ b/src/pocketmine/block/Skull.php @@ -37,7 +37,7 @@ class Skull extends Flowable{ protected $id = self::SKULL_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Slab.php b/src/pocketmine/block/Slab.php index 96fec3e31..26ea65ca3 100644 --- a/src/pocketmine/block/Slab.php +++ b/src/pocketmine/block/Slab.php @@ -32,7 +32,7 @@ use pocketmine\Player; abstract class Slab extends Transparent{ public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } abstract public function getDoubleSlabId() : int; diff --git a/src/pocketmine/block/Snow.php b/src/pocketmine/block/Snow.php index b6e00b3bd..20e9919c1 100644 --- a/src/pocketmine/block/Snow.php +++ b/src/pocketmine/block/Snow.php @@ -32,7 +32,7 @@ class Snow extends Solid{ protected $id = self::SNOW_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/SnowLayer.php b/src/pocketmine/block/SnowLayer.php index 9c4106f31..0a709d45b 100644 --- a/src/pocketmine/block/SnowLayer.php +++ b/src/pocketmine/block/SnowLayer.php @@ -35,7 +35,7 @@ class SnowLayer extends Flowable{ protected $id = self::SNOW_LAYER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/SoulSand.php b/src/pocketmine/block/SoulSand.php index 5e402678e..44e9900fd 100644 --- a/src/pocketmine/block/SoulSand.php +++ b/src/pocketmine/block/SoulSand.php @@ -30,7 +30,7 @@ class SoulSand extends Solid{ protected $id = self::SOUL_SAND; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Sponge.php b/src/pocketmine/block/Sponge.php index 4553f6fc5..1f9289e20 100644 --- a/src/pocketmine/block/Sponge.php +++ b/src/pocketmine/block/Sponge.php @@ -29,7 +29,7 @@ class Sponge extends Solid{ protected $id = self::SPONGE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/StandingBanner.php b/src/pocketmine/block/StandingBanner.php index 9d6675914..388ae5e6d 100644 --- a/src/pocketmine/block/StandingBanner.php +++ b/src/pocketmine/block/StandingBanner.php @@ -39,7 +39,7 @@ class StandingBanner extends Transparent{ protected $itemId = Item::BANNER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Stone.php b/src/pocketmine/block/Stone.php index c3a6d8c21..47b096235 100644 --- a/src/pocketmine/block/Stone.php +++ b/src/pocketmine/block/Stone.php @@ -39,7 +39,7 @@ class Stone extends Solid{ protected $id = self::STONE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/StoneBrickStairs.php b/src/pocketmine/block/StoneBrickStairs.php index dc1220300..ec397251a 100644 --- a/src/pocketmine/block/StoneBrickStairs.php +++ b/src/pocketmine/block/StoneBrickStairs.php @@ -30,7 +30,7 @@ class StoneBrickStairs extends Stair{ protected $id = self::STONE_BRICK_STAIRS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getToolType() : int{ diff --git a/src/pocketmine/block/StoneBricks.php b/src/pocketmine/block/StoneBricks.php index 3b17797ba..34518a823 100644 --- a/src/pocketmine/block/StoneBricks.php +++ b/src/pocketmine/block/StoneBricks.php @@ -34,7 +34,7 @@ class StoneBricks extends Solid{ protected $id = self::STONE_BRICKS; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/StonePressurePlate.php b/src/pocketmine/block/StonePressurePlate.php index dc72f72a5..f11f7aebc 100644 --- a/src/pocketmine/block/StonePressurePlate.php +++ b/src/pocketmine/block/StonePressurePlate.php @@ -30,7 +30,7 @@ class StonePressurePlate extends Transparent{ protected $id = self::STONE_PRESSURE_PLATE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Stonecutter.php b/src/pocketmine/block/Stonecutter.php index e8a6a40d4..1532b2338 100644 --- a/src/pocketmine/block/Stonecutter.php +++ b/src/pocketmine/block/Stonecutter.php @@ -30,7 +30,7 @@ class Stonecutter extends Solid{ protected $id = self::STONECUTTER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Sugarcane.php b/src/pocketmine/block/Sugarcane.php index 2a2e8266e..f3e25880c 100644 --- a/src/pocketmine/block/Sugarcane.php +++ b/src/pocketmine/block/Sugarcane.php @@ -37,7 +37,7 @@ class Sugarcane extends Flowable{ protected $itemId = Item::SUGARCANE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/TNT.php b/src/pocketmine/block/TNT.php index 5ebae29cd..7fa63d9d0 100644 --- a/src/pocketmine/block/TNT.php +++ b/src/pocketmine/block/TNT.php @@ -36,7 +36,7 @@ class TNT extends Solid{ protected $id = self::TNT; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/TallGrass.php b/src/pocketmine/block/TallGrass.php index 5d15a10e8..d7e0b45f5 100644 --- a/src/pocketmine/block/TallGrass.php +++ b/src/pocketmine/block/TallGrass.php @@ -34,7 +34,7 @@ class TallGrass extends Flowable{ protected $id = self::TALL_GRASS; public function __construct(int $meta = 1){ - $this->meta = $meta; + $this->setDamage($meta); } public function canBeReplaced() : bool{ diff --git a/src/pocketmine/block/Torch.php b/src/pocketmine/block/Torch.php index 98473c92d..c56f86ba8 100644 --- a/src/pocketmine/block/Torch.php +++ b/src/pocketmine/block/Torch.php @@ -33,7 +33,7 @@ class Torch extends Flowable{ protected $id = self::TORCH; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getLightLevel() : int{ diff --git a/src/pocketmine/block/Trapdoor.php b/src/pocketmine/block/Trapdoor.php index 437ca730e..b5eb3d9d8 100644 --- a/src/pocketmine/block/Trapdoor.php +++ b/src/pocketmine/block/Trapdoor.php @@ -43,7 +43,7 @@ class Trapdoor extends Transparent{ protected $id = self::TRAPDOOR; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Tripwire.php b/src/pocketmine/block/Tripwire.php index 9a1f718ee..e916fcb69 100644 --- a/src/pocketmine/block/Tripwire.php +++ b/src/pocketmine/block/Tripwire.php @@ -31,7 +31,7 @@ class Tripwire extends Flowable{ protected $id = self::TRIPWIRE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/TripwireHook.php b/src/pocketmine/block/TripwireHook.php index 8bf328573..f505dd92a 100644 --- a/src/pocketmine/block/TripwireHook.php +++ b/src/pocketmine/block/TripwireHook.php @@ -28,7 +28,7 @@ class TripwireHook extends Flowable{ protected $id = self::TRIPWIRE_HOOK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Vine.php b/src/pocketmine/block/Vine.php index de7e9e18f..300c120b2 100644 --- a/src/pocketmine/block/Vine.php +++ b/src/pocketmine/block/Vine.php @@ -39,7 +39,7 @@ class Vine extends Flowable{ protected $id = self::VINE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Water.php b/src/pocketmine/block/Water.php index a4c96bdab..777696ff3 100644 --- a/src/pocketmine/block/Water.php +++ b/src/pocketmine/block/Water.php @@ -31,7 +31,7 @@ class Water extends Liquid{ protected $id = self::FLOWING_WATER; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/WaterLily.php b/src/pocketmine/block/WaterLily.php index 4260a8a3e..edee10a13 100644 --- a/src/pocketmine/block/WaterLily.php +++ b/src/pocketmine/block/WaterLily.php @@ -34,7 +34,7 @@ class WaterLily extends Flowable{ protected $id = self::WATER_LILY; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/WeightedPressurePlateLight.php b/src/pocketmine/block/WeightedPressurePlateLight.php index c36d107f6..5633173c8 100644 --- a/src/pocketmine/block/WeightedPressurePlateLight.php +++ b/src/pocketmine/block/WeightedPressurePlateLight.php @@ -30,7 +30,7 @@ class WeightedPressurePlateLight extends Transparent{ protected $id = self::LIGHT_WEIGHTED_PRESSURE_PLATE; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Wheat.php b/src/pocketmine/block/Wheat.php index 61ac91e11..c0d455a08 100644 --- a/src/pocketmine/block/Wheat.php +++ b/src/pocketmine/block/Wheat.php @@ -31,7 +31,7 @@ class Wheat extends Crops{ protected $id = self::WHEAT_BLOCK; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getName() : string{ diff --git a/src/pocketmine/block/Wood.php b/src/pocketmine/block/Wood.php index f50cdea3e..375cd15df 100644 --- a/src/pocketmine/block/Wood.php +++ b/src/pocketmine/block/Wood.php @@ -37,7 +37,7 @@ class Wood extends Solid{ protected $id = self::WOOD; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{ diff --git a/src/pocketmine/block/Wool.php b/src/pocketmine/block/Wool.php index 3c6fa7d78..7963a13f9 100644 --- a/src/pocketmine/block/Wool.php +++ b/src/pocketmine/block/Wool.php @@ -31,7 +31,7 @@ class Wool extends Solid{ protected $id = self::WOOL; public function __construct(int $meta = 0){ - $this->meta = $meta; + $this->setDamage($meta); } public function getHardness() : float{