From d0e2cdb54ce85627af53c5b21f5ee22fbe137153 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 25 Nov 2018 15:58:24 +0000 Subject: [PATCH] Tile: remove server field it would be nice to get rid of the server dependency entirely... perhaps craftingmanager should be a singleton? it's contextless after all... --- src/pocketmine/tile/Furnace.php | 2 +- src/pocketmine/tile/Tile.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pocketmine/tile/Furnace.php b/src/pocketmine/tile/Furnace.php index c276d326a..aef45ecb0 100644 --- a/src/pocketmine/tile/Furnace.php +++ b/src/pocketmine/tile/Furnace.php @@ -174,7 +174,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{ $fuel = $this->inventory->getFuel(); $raw = $this->inventory->getSmelting(); $product = $this->inventory->getResult(); - $smelt = $this->server->getCraftingManager()->matchFurnaceRecipe($raw); + $smelt = $this->level->getServer()->getCraftingManager()->matchFurnaceRecipe($raw); $canSmelt = ($smelt instanceof FurnaceRecipe and $raw->getCount() > 0 and (($smelt->getResult()->equals($product) and $product->getCount() < $product->getMaxStackSize()) or $product->isNull())); if($this->burnTime <= 0 and $canSmelt and $fuel->getFuelTime() > 0 and $fuel->getCount() > 0){ diff --git a/src/pocketmine/tile/Tile.php b/src/pocketmine/tile/Tile.php index abe5df44f..3d629a978 100644 --- a/src/pocketmine/tile/Tile.php +++ b/src/pocketmine/tile/Tile.php @@ -69,8 +69,6 @@ abstract class Tile extends Position{ public $name; /** @var bool */ public $closed = false; - /** @var Server */ - protected $server; /** @var TimingsHandler */ protected $timings; @@ -140,7 +138,6 @@ abstract class Tile extends Position{ public function __construct(Level $level, CompoundTag $nbt){ $this->timings = Timings::getTileEntityTimings($this); - $this->server = $level->getServer(); $this->name = ""; parent::__construct($nbt->getInt(self::TAG_X), $nbt->getInt(self::TAG_Y), $nbt->getInt(self::TAG_Z), $level);