From 8ce833bf7451aef7a391f4654dcce3297f2e9705 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 25 Aug 2017 12:41:49 +0100 Subject: [PATCH] Stripped redundant trailing commas --- src/pocketmine/block/Anvil.php | 2 +- src/pocketmine/block/Bed.php | 2 +- src/pocketmine/block/Block.php | 2 +- src/pocketmine/block/BurningFurnace.php | 2 +- src/pocketmine/block/Chest.php | 2 +- src/pocketmine/block/Door.php | 2 +- src/pocketmine/block/DoubleStoneSlab.php | 4 ++-- src/pocketmine/block/EmeraldOre.php | 2 +- src/pocketmine/block/Fallable.php | 2 +- src/pocketmine/block/FlowerPot.php | 2 +- src/pocketmine/block/Grass.php | 2 +- src/pocketmine/block/HayBale.php | 2 +- src/pocketmine/block/Ladder.php | 2 +- src/pocketmine/block/Leaves.php | 2 +- src/pocketmine/block/Leaves2.php | 2 +- src/pocketmine/block/Prismarine.php | 2 +- src/pocketmine/block/Quartz.php | 2 +- src/pocketmine/block/Stair.php | 2 +- src/pocketmine/block/StoneBricks.php | 2 +- src/pocketmine/block/StoneSlab.php | 2 +- src/pocketmine/block/Torch.php | 2 +- src/pocketmine/block/Vine.php | 2 +- src/pocketmine/block/WallSign.php | 2 +- src/pocketmine/block/Wood.php | 4 ++-- src/pocketmine/block/utils/ColorBlockMetaHelper.php | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index f0e4f3fff3..b88af41a0c 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -84,7 +84,7 @@ class Anvil extends Fallable{ public function getDrops(Item $item) : array{ if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c, 1), + ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c, 1) ]; } diff --git a/src/pocketmine/block/Bed.php b/src/pocketmine/block/Bed.php index 3cbad37586..a6aa3fd8e5 100644 --- a/src/pocketmine/block/Bed.php +++ b/src/pocketmine/block/Bed.php @@ -189,7 +189,7 @@ class Bed extends Transparent{ new ByteTag("color", $item->getDamage() & 0x0f), new IntTag("x", $block->x), new IntTag("y", $block->y), - new IntTag("z", $block->z), + new IntTag("z", $block->z) ]); $nbt2 = clone $nbt; diff --git a/src/pocketmine/block/Block.php b/src/pocketmine/block/Block.php index 0304a4b33c..396343f9af 100644 --- a/src/pocketmine/block/Block.php +++ b/src/pocketmine/block/Block.php @@ -351,7 +351,7 @@ class Block extends Position implements BlockIds, Metadatable{ */ public function getDrops(Item $item) : array{ return [ - ItemFactory::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1), + ItemFactory::get($this->getItemId(), $this->getDamage() & $this->getVariantBitmask(), 1) ]; } diff --git a/src/pocketmine/block/BurningFurnace.php b/src/pocketmine/block/BurningFurnace.php index 22b06f629e..e245c2a311 100644 --- a/src/pocketmine/block/BurningFurnace.php +++ b/src/pocketmine/block/BurningFurnace.php @@ -64,7 +64,7 @@ class BurningFurnace extends Solid{ 0 => 4, 1 => 2, 2 => 5, - 3 => 3, + 3 => 3 ]; $this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0]; $this->getLevel()->setBlock($block, $this, true, true); diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php index a3a3376c17..c6312e8fcc 100644 --- a/src/pocketmine/block/Chest.php +++ b/src/pocketmine/block/Chest.php @@ -72,7 +72,7 @@ class Chest extends Transparent{ 0 => 4, 1 => 2, 2 => 5, - 3 => 3, + 3 => 3 ]; $chest = null; diff --git a/src/pocketmine/block/Door.php b/src/pocketmine/block/Door.php index bd6b2f899d..3c74cba2b0 100644 --- a/src/pocketmine/block/Door.php +++ b/src/pocketmine/block/Door.php @@ -228,7 +228,7 @@ abstract class Door extends Transparent{ 0 => 3, 1 => 4, 2 => 2, - 3 => 5, + 3 => 5 ]; $next = $this->getSide($faces[($direction + 2) % 4]); $next2 = $this->getSide($faces[$direction]); diff --git a/src/pocketmine/block/DoubleStoneSlab.php b/src/pocketmine/block/DoubleStoneSlab.php index 07850aba6a..82128b3558 100644 --- a/src/pocketmine/block/DoubleStoneSlab.php +++ b/src/pocketmine/block/DoubleStoneSlab.php @@ -52,7 +52,7 @@ class DoubleStoneSlab extends Solid{ 4 => "Brick", 5 => "Stone Brick", 6 => "Quartz", - 7 => "Nether Brick", + 7 => "Nether Brick" ]; return "Double " . $names[$this->meta & 0x07] . " Slab"; } @@ -60,7 +60,7 @@ class DoubleStoneSlab extends Solid{ public function getDrops(Item $item) : array{ if($item->isPickaxe() >= Tool::TIER_WOODEN){ return [ - ItemFactory::get(Item::STONE_SLAB, $this->getDamage() & 0x07, 2), + ItemFactory::get(Item::STONE_SLAB, $this->getDamage() & 0x07, 2) ]; } diff --git a/src/pocketmine/block/EmeraldOre.php b/src/pocketmine/block/EmeraldOre.php index 24ba01db1d..9e5549c8f3 100644 --- a/src/pocketmine/block/EmeraldOre.php +++ b/src/pocketmine/block/EmeraldOre.php @@ -50,7 +50,7 @@ class EmeraldOre extends Solid{ public function getDrops(Item $item) : array{ if($item->isPickaxe() >= Tool::TIER_IRON){ return [ - ItemFactory::get(Item::EMERALD, 0, 1), + ItemFactory::get(Item::EMERALD, 0, 1) ]; } diff --git a/src/pocketmine/block/Fallable.php b/src/pocketmine/block/Fallable.php index a8ded40890..748585d77a 100644 --- a/src/pocketmine/block/Fallable.php +++ b/src/pocketmine/block/Fallable.php @@ -56,7 +56,7 @@ abstract class Fallable extends Solid{ new FloatTag("", 0) ]), new IntTag("TileID", $this->getId()), - new ByteTag("Data", $this->getDamage()), + new ByteTag("Data", $this->getDamage()) ])); $fall->spawnToAll(); diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php index 643bc2848c..0e1c4bef59 100644 --- a/src/pocketmine/block/FlowerPot.php +++ b/src/pocketmine/block/FlowerPot.php @@ -76,7 +76,7 @@ class FlowerPot extends Flowable{ new IntTag("y", $block->y), new IntTag("z", $block->z), new ShortTag("item", 0), - new IntTag("mData", 0), + new IntTag("mData", 0) ]); if($item->hasCustomBlockData()){ diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php index 657e174967..e60995fee3 100644 --- a/src/pocketmine/block/Grass.php +++ b/src/pocketmine/block/Grass.php @@ -55,7 +55,7 @@ class Grass extends Solid{ public function getDrops(Item $item) : array{ return [ - ItemFactory::get(Item::DIRT, 0, 1), + ItemFactory::get(Item::DIRT, 0, 1) ]; } diff --git a/src/pocketmine/block/HayBale.php b/src/pocketmine/block/HayBale.php index f9567056e3..b13bfdd4e3 100644 --- a/src/pocketmine/block/HayBale.php +++ b/src/pocketmine/block/HayBale.php @@ -50,7 +50,7 @@ class HayBale extends Solid{ 2 => 0b1000, 3 => 0b1000, 4 => 0b0100, - 5 => 0b0100, + 5 => 0b0100 ]; $this->meta = ($this->meta & 0x03) | $faces[$face]; diff --git a/src/pocketmine/block/Ladder.php b/src/pocketmine/block/Ladder.php index be3a9f1199..c118d78be0 100644 --- a/src/pocketmine/block/Ladder.php +++ b/src/pocketmine/block/Ladder.php @@ -116,7 +116,7 @@ class Ladder extends Transparent{ 2 => 2, 3 => 3, 4 => 4, - 5 => 5, + 5 => 5 ]; if(isset($faces[$face])){ $this->meta = $faces[$face]; diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index 8d2441e7ee..2d4b01955b 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -59,7 +59,7 @@ class Leaves extends Transparent{ self::OAK => "Oak Leaves", self::SPRUCE => "Spruce Leaves", self::BIRCH => "Birch Leaves", - self::JUNGLE => "Jungle Leaves", + self::JUNGLE => "Jungle Leaves" ]; return $names[$this->meta & 0x03]; } diff --git a/src/pocketmine/block/Leaves2.php b/src/pocketmine/block/Leaves2.php index fb8c77920e..553ab0c5c4 100644 --- a/src/pocketmine/block/Leaves2.php +++ b/src/pocketmine/block/Leaves2.php @@ -34,7 +34,7 @@ class Leaves2 extends Leaves{ public function getName() : string{ static $names = [ self::ACACIA => "Acacia Leaves", - self::DARK_OAK => "Dark Oak Leaves", + self::DARK_OAK => "Dark Oak Leaves" ]; return $names[$this->meta & 0x03] ?? "Unknown"; } diff --git a/src/pocketmine/block/Prismarine.php b/src/pocketmine/block/Prismarine.php index d7b7f7aec3..4984176744 100644 --- a/src/pocketmine/block/Prismarine.php +++ b/src/pocketmine/block/Prismarine.php @@ -46,7 +46,7 @@ class Prismarine extends Solid{ static $names = [ self::NORMAL => "Prismarine", self::DARK => "Dark Prismarine", - self::BRICKS => "Prismarine Bricks", + self::BRICKS => "Prismarine Bricks" ]; return $names[$this->meta & 0x03] ?? "Unknown"; } diff --git a/src/pocketmine/block/Quartz.php b/src/pocketmine/block/Quartz.php index 5bd4a8733d..bf2340cd7b 100644 --- a/src/pocketmine/block/Quartz.php +++ b/src/pocketmine/block/Quartz.php @@ -48,7 +48,7 @@ class Quartz extends Solid{ self::QUARTZ_NORMAL => "Quartz Block", self::QUARTZ_CHISELED => "Chiseled Quartz Block", self::QUARTZ_PILLAR => "Quartz Pillar", - self::QUARTZ_PILLAR2 => "Quartz Pillar", + self::QUARTZ_PILLAR2 => "Quartz Pillar" ]; return $names[$this->meta & 0x03]; } diff --git a/src/pocketmine/block/Stair.php b/src/pocketmine/block/Stair.php index a17b17eca2..c3302f074a 100644 --- a/src/pocketmine/block/Stair.php +++ b/src/pocketmine/block/Stair.php @@ -135,7 +135,7 @@ abstract class Stair extends Transparent{ 0 => 0, 1 => 2, 2 => 1, - 3 => 3, + 3 => 3 ]; $this->meta = $faces[$player->getDirection()] & 0x03; if(($facePos->y > 0.5 and $face !== Vector3::SIDE_UP) or $face === Vector3::SIDE_DOWN){ diff --git a/src/pocketmine/block/StoneBricks.php b/src/pocketmine/block/StoneBricks.php index 0645c517b9..50db48a686 100644 --- a/src/pocketmine/block/StoneBricks.php +++ b/src/pocketmine/block/StoneBricks.php @@ -51,7 +51,7 @@ class StoneBricks extends Solid{ self::NORMAL => "Stone Bricks", self::MOSSY => "Mossy Stone Bricks", self::CRACKED => "Cracked Stone Bricks", - self::CHISELED => "Chiseled Stone Bricks", + self::CHISELED => "Chiseled Stone Bricks" ]; return $names[$this->meta & 0x03]; } diff --git a/src/pocketmine/block/StoneSlab.php b/src/pocketmine/block/StoneSlab.php index 3758e87c47..e6d5077a69 100644 --- a/src/pocketmine/block/StoneSlab.php +++ b/src/pocketmine/block/StoneSlab.php @@ -53,7 +53,7 @@ class StoneSlab extends WoodenSlab{ self::BRICK => "Brick", self::STONE_BRICK => "Stone Brick", self::QUARTZ => "Quartz", - self::NETHER_BRICK => "Nether Brick", + self::NETHER_BRICK => "Nether Brick" ]; return (($this->meta & 0x08) > 0 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab"; } diff --git a/src/pocketmine/block/Torch.php b/src/pocketmine/block/Torch.php index 44ca18a023..b890dd004b 100644 --- a/src/pocketmine/block/Torch.php +++ b/src/pocketmine/block/Torch.php @@ -77,7 +77,7 @@ class Torch extends Flowable{ Vector3::SIDE_NORTH => 4, Vector3::SIDE_SOUTH => 3, Vector3::SIDE_WEST => 2, - Vector3::SIDE_EAST => 1, + Vector3::SIDE_EAST => 1 ]; $this->meta = $faces[$face]; $this->getLevel()->setBlock($block, $this, true, true); diff --git a/src/pocketmine/block/Vine.php b/src/pocketmine/block/Vine.php index ebe09985bb..fe9d4fdf4c 100644 --- a/src/pocketmine/block/Vine.php +++ b/src/pocketmine/block/Vine.php @@ -143,7 +143,7 @@ class Vine extends Transparent{ 2 => self::FLAG_SOUTH, 3 => self::FLAG_NORTH, 4 => self::FLAG_EAST, - 5 => self::FLAG_WEST, + 5 => self::FLAG_WEST ]; if(isset($faces[$face])){ $this->meta = $faces[$face]; diff --git a/src/pocketmine/block/WallSign.php b/src/pocketmine/block/WallSign.php index 50863d8248..62ce2507fb 100644 --- a/src/pocketmine/block/WallSign.php +++ b/src/pocketmine/block/WallSign.php @@ -38,7 +38,7 @@ class WallSign extends SignPost{ 2 => 3, 3 => 2, 4 => 5, - 5 => 4, + 5 => 4 ]; if($type === Level::BLOCK_UPDATE_NORMAL){ if(isset($faces[$this->meta])){ diff --git a/src/pocketmine/block/Wood.php b/src/pocketmine/block/Wood.php index bf19330132..6bdb45dee9 100644 --- a/src/pocketmine/block/Wood.php +++ b/src/pocketmine/block/Wood.php @@ -49,7 +49,7 @@ class Wood extends Solid{ self::OAK => "Oak Wood", self::SPRUCE => "Spruce Wood", self::BIRCH => "Birch Wood", - self::JUNGLE => "Jungle Wood", + self::JUNGLE => "Jungle Wood" ]; return $names[$this->meta & 0x03]; } @@ -61,7 +61,7 @@ class Wood extends Solid{ Vector3::SIDE_NORTH => 0b1000, Vector3::SIDE_SOUTH => 0b1000, Vector3::SIDE_WEST => 0b0100, - Vector3::SIDE_EAST => 0b0100, + Vector3::SIDE_EAST => 0b0100 ]; $this->meta = ($this->meta & 0x03) | $faces[$face]; diff --git a/src/pocketmine/block/utils/ColorBlockMetaHelper.php b/src/pocketmine/block/utils/ColorBlockMetaHelper.php index 01a6ab77f9..246c2e7cd2 100644 --- a/src/pocketmine/block/utils/ColorBlockMetaHelper.php +++ b/src/pocketmine/block/utils/ColorBlockMetaHelper.php @@ -42,7 +42,7 @@ class ColorBlockMetaHelper{ 12 => "Brown", 13 => "Green", 14 => "Red", - 15 => "Black", + 15 => "Black" ]; return $names[$meta] ?? "Unknown";