From d9134f28e406390e9d73e786741ad25beba352c8 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 23 Mar 2019 19:50:07 +0000
Subject: [PATCH] Rename CobblestoneWall -> Wall

---
 src/pocketmine/block/BlockFactory.php         | 30 +++++++++----------
 src/pocketmine/block/FenceGate.php            |  4 +--
 .../block/{CobblestoneWall.php => Wall.php}   |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)
 rename src/pocketmine/block/{CobblestoneWall.php => Wall.php} (98%)

diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php
index 5494c61b5..0074439f0 100644
--- a/src/pocketmine/block/BlockFactory.php
+++ b/src/pocketmine/block/BlockFactory.php
@@ -453,23 +453,23 @@ class BlockFactory{
 		}
 
 		static $wallTypes = [
-			CobblestoneWall::ANDESITE_WALL => "Andesite",
-			CobblestoneWall::BRICK_WALL => "Brick",
-			CobblestoneWall::DIORITE_WALL => "Diorite",
-			CobblestoneWall::END_STONE_BRICK_WALL => "End Stone Brick",
-			CobblestoneWall::GRANITE_WALL => "Granite",
-			CobblestoneWall::MOSSY_STONE_BRICK_WALL => "Mossy Stone Brick",
-			CobblestoneWall::MOSSY_WALL => "Mossy Cobblestone",
-			CobblestoneWall::NETHER_BRICK_WALL => "Nether Brick",
-			CobblestoneWall::NONE_MOSSY_WALL => "Cobblestone",
-			CobblestoneWall::PRISMARINE_WALL => "Prismarine",
-			CobblestoneWall::RED_NETHER_BRICK_WALL => "Red Nether Brick",
-			CobblestoneWall::RED_SANDSTONE_WALL => "Red Sandstone",
-			CobblestoneWall::SANDSTONE_WALL => "Sandstone",
-			CobblestoneWall::STONE_BRICK_WALL => "Stone Brick"
+			Wall::ANDESITE_WALL => "Andesite",
+			Wall::BRICK_WALL => "Brick",
+			Wall::DIORITE_WALL => "Diorite",
+			Wall::END_STONE_BRICK_WALL => "End Stone Brick",
+			Wall::GRANITE_WALL => "Granite",
+			Wall::MOSSY_STONE_BRICK_WALL => "Mossy Stone Brick",
+			Wall::MOSSY_WALL => "Mossy Cobblestone",
+			Wall::NETHER_BRICK_WALL => "Nether Brick",
+			Wall::NONE_MOSSY_WALL => "Cobblestone",
+			Wall::PRISMARINE_WALL => "Prismarine",
+			Wall::RED_NETHER_BRICK_WALL => "Red Nether Brick",
+			Wall::RED_SANDSTONE_WALL => "Red Sandstone",
+			Wall::SANDSTONE_WALL => "Sandstone",
+			Wall::STONE_BRICK_WALL => "Stone Brick"
 		];
 		foreach($wallTypes as $magicNumber => $prefix){
-			self::register(new CobblestoneWall(new BID(BlockLegacyIds::COBBLESTONE_WALL, $magicNumber), $prefix . " Wall"));
+			self::register(new Wall(new BID(BlockLegacyIds::COBBLESTONE_WALL, $magicNumber), $prefix . " Wall"));
 		}
 
 		//TODO: minecraft:andesite_stairs
diff --git a/src/pocketmine/block/FenceGate.php b/src/pocketmine/block/FenceGate.php
index 564c9d610..a338f8bf4 100644
--- a/src/pocketmine/block/FenceGate.php
+++ b/src/pocketmine/block/FenceGate.php
@@ -73,8 +73,8 @@ class FenceGate extends Transparent{
 
 	private function checkInWall() : bool{
 		return (
-			$this->getSide(Facing::rotateY($this->facing, false)) instanceof CobblestoneWall or
-			$this->getSide(Facing::rotateY($this->facing, true)) instanceof CobblestoneWall
+			$this->getSide(Facing::rotateY($this->facing, false)) instanceof Wall or
+			$this->getSide(Facing::rotateY($this->facing, true)) instanceof Wall
 		);
 	}
 
diff --git a/src/pocketmine/block/CobblestoneWall.php b/src/pocketmine/block/Wall.php
similarity index 98%
rename from src/pocketmine/block/CobblestoneWall.php
rename to src/pocketmine/block/Wall.php
index 79579f117..389b8619b 100644
--- a/src/pocketmine/block/CobblestoneWall.php
+++ b/src/pocketmine/block/Wall.php
@@ -27,7 +27,7 @@ use pocketmine\item\TieredTool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 
-class CobblestoneWall extends Transparent{
+class Wall extends Transparent{
 	public const NONE_MOSSY_WALL = 0;
 	public const MOSSY_WALL = 1;
 	public const GRANITE_WALL = 2;