Removed fence classes, added fence damage (¬¬ Mojang)

src/pocketmine/block/Block.php

@@ -144,7 +144,6 @@ class Block extends Position implements Metadatable{
 	const SUGARCANE_BLOCK = 83;
 
 	const FENCE = 85;
-	const FENCE_OAK = 85;
 	const PUMPKIN = 86;
 	const NETHERRACK = 87;
 	const SOUL_SAND = 88;
@@ -236,11 +235,6 @@ class Block extends Position implements Metadatable{
 	const FENCE_GATE_JUNGLE = 185;
 	const FENCE_GATE_DARK_OAK = 186;
 	const FENCE_GATE_ACACIA = 187;
-	const FENCE_SPRUCE = 188;
-	const FENCE_BIRCH = 189;
-	const FENCE_JUNGLE = 190;
-	const FENCE_DARK_OAK = 191;
-	const FENCE_ACACIA = 192;
 
 	const PODZOL = 243;
 	const BEETROOT_BLOCK = 244;
@@ -368,10 +362,11 @@ class Block extends Position implements Metadatable{
 		[Item::WOODEN_DOOR, 0],
 		[Item::TRAPDOOR, 0],
 		[Item::FENCE, 0],
-		[Item::FENCE_SPRUCE, 0],
+		[Item::FENCE, 1],
-		[Item::FENCE_BIRCH, 0],
+		[Item::FENCE, 2],
-		[Item::FENCE_DARK_OAK, 0],
+		[Item::FENCE, 3],
-		[Item::FENCE_JUNGLE, 0],
+		[Item::FENCE, 4],
+		[Item::FENCE, 5],
 		[Item::FENCE_GATE, 0],
 		[Item::FENCE_GATE_BIRCH, 0],
 		[Item::FENCE_GATE_SPRUCE, 0],
@@ -723,11 +718,6 @@ class Block extends Position implements Metadatable{
 			self::$list[self::FENCE_GATE_JUNGLE] = FenceGateJungle::class;
 			self::$list[self::FENCE_GATE_DARK_OAK] = FenceGateDarkOak::class;
 			self::$list[self::FENCE_GATE_ACACIA] = FenceGateAcacia::class;
-			self::$list[self::FENCE_SPRUCE] = FenceSpruce::class;
-			self::$list[self::FENCE_BIRCH] = FenceBirch::class;
-			self::$list[self::FENCE_DARK_OAK] = FenceDarkOak::class;
-			self::$list[self::FENCE_JUNGLE] = FenceJungle::class;
-			self::$list[self::FENCE_ACACIA] = FenceAcacia::class;
 
 			self::$list[self::PODZOL] = Podzol::class;
 			self::$list[self::BEETROOT_BLOCK] = Beetroot::class;

src/pocketmine/block/Fence.php

@@ -27,16 +27,27 @@ class Fence extends Transparent{
 
 	protected $id = self::FENCE;
 
-	public function __construct(){
+	public function __construct($meta = 0){
-
+		$this->meta = $meta;
 	}
 
 	public function getHardness(){
 		return 15;
 	}
 
+
 	public function getName(){
-		return "Oak Fence";
+		static $names = [
+			0 => "Oak Fence",
+			1 => "Spruce Fence",
+			2 => "Birch Fence",
+			3 => "Jungle Fence",
+			4 => "Acacia Fence",
+			5 => "Jungle Fence",
+			"",
+			""
+		];
+		return $names[$this->meta & 0x07];
 	}
 
 	protected function recalculateBoundingBox(){

src/pocketmine/block/FenceAcacia.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\block;
-
-class FenceAcacia extends Fence{
-
-	protected $id = self::FENCE_ACACIA;
-
-	public function getName(){
-		return "Acacia Fence";
-	}
-}

src/pocketmine/block/FenceBirch.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\block;
-
-class FenceBirch extends Fence{
-
-	protected $id = self::FENCE_BIRCH;
-
-	public function getName(){
-		return "Birch Fence";
-	}
-}

src/pocketmine/block/FenceDarkOak.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\block;
-
-class FenceDarkOak extends Fence{
-
-	protected $id = self::FENCE_DARK_OAK;
-
-	public function getName(){
-		return "Dark Oak Fence";
-	}
-}

src/pocketmine/block/FenceJungle.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\block;
-
-class FenceJungle extends Fence{
-
-	protected $id = self::FENCE_JUNGLE;
-
-	public function getName(){
-		return "Jungle Fence";
-	}
-}

src/pocketmine/block/FenceSpruce.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\block;
-
-class FenceSpruce extends Fence{
-
-	protected $id = self::FENCE_SPRUCE;
-
-	public function getName(){
-		return "Spruce Fence";
-	}
-}

src/pocketmine/entity/Entity.php

@@ -1242,8 +1242,7 @@ abstract class Entity extends Location implements Metadatable{
 		if(!$this->closed){
 			$this->server->getPluginManager()->callEvent(new EntityDespawnEvent($this));
 			$this->closed = true;
-			unset($this->level->updateEntities[$this->id]);
+			if($this->chunk !== null){
-			if($this->chunk instanceof FullChunk){
 				$this->chunk->removeEntity($this);
 			}
 			if($this->level instanceof Level){

src/pocketmine/inventory/CraftingManager.php

@@ -73,11 +73,11 @@ class CraftingManager{
 		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::BED, 0, 1)))->addIngredient(Item::get(Item::WOOL, null, 3))->addIngredient(Item::get(Item::WOODEN_PLANK, null, 3)));
 		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::CHEST, 0, 1)))->addIngredient(Item::get(Item::WOODEN_PLANK, null, 8)));
 		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE, 0, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::OAK, 4)));
-		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_SPRUCE, 0, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::SPRUCE, 4)));
+		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE, Planks::SPRUCE, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::SPRUCE, 4)));
-		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_BIRCH, 0, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::BIRCH, 4)));
+		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE, Planks::BIRCH, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::BIRCH, 4)));
-		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_JUNGLE, 0, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::JUNGLE, 4)));
+		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE, Planks::JUNGLE, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::JUNGLE, 4)));
-		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_ACACIA, 0, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::ACACIA, 4)));
+		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE, Planks::ACACIA, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::ACACIA, 4)));
-		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_DARK_OAK, 0, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::DARK_OAK, 4)));
+		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE, Planks::DARK_OAK, 3)))->addIngredient(Item::get(Item::STICK, 0, 2))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::DARK_OAK, 4)));
 		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_GATE, 0, 1)))->addIngredient(Item::get(Item::STICK, 0, 4))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::OAK, 2))->addIngredient(Item::get(Item::STICK, 0, 4)));
 		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_GATE_SPRUCE, 0, 1)))->addIngredient(Item::get(Item::STICK, 0, 4))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::SPRUCE, 2))->addIngredient(Item::get(Item::STICK, 0, 4)));
 		$this->registerRecipe((new BigShapelessRecipe(Item::get(Item::FENCE_GATE_BIRCH, 0, 1)))->addIngredient(Item::get(Item::STICK, 0, 4))->addIngredient(Item::get(Item::WOODEN_PLANK, Planks::BIRCH, 2))->addIngredient(Item::get(Item::STICK, 0, 4)));

src/pocketmine/item/Item.php

@@ -227,11 +227,6 @@ class Item{
 	const FENCE_GATE_JUNGLE = 185;
 	const FENCE_GATE_DARK_OAK = 186;
 	const FENCE_GATE_ACACIA = 187;
-	const FENCE_SPRUCE = 188;
-	const FENCE_BIRCH = 189;
-	const FENCE_JUNGLE = 190;
-	const FENCE_DARK_OAK = 191;
-	const FENCE_ACACIA = 192;
 
 	const PODZOL = 243;
 	const BEETROOT_BLOCK = 244;

src/pocketmine/level/format/leveldb/Chunk.php

@@ -297,10 +297,12 @@ class Chunk extends BaseFullChunk{
 
 			$tiles = [];
 			foreach($this->getTiles() as $tile){
+				if(!$tile->closed){
 					$tile->saveNBT();
 					$nbt->setData($tile->namedtag);
 					$tiles[] = $nbt->write();
 				}
+			}
 
 			if(count($tiles) > 0){
 				$provider->getDatabase()->put($chunkIndex . "\x31", implode($tiles));