mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-28 22:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Relocated Server->registerTiles() to Tile::init()

Browse Source
This commit is contained in:
Dylan K. Taylor 2016-11-27 14:46:50 +00:00
parent 90957cd908
commit 4063bc4ffb
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pocketmine/Server.php
View File

@ -103,13 +103,6 @@ use pocketmine\plugin\ScriptPluginLoader;
use pocketmine\scheduler\FileWriteTask; use pocketmine\scheduler\FileWriteTask;
use pocketmine\scheduler\SendUsageTask; use pocketmine\scheduler\SendUsageTask;
use pocketmine\scheduler\ServerScheduler; use pocketmine\scheduler\ServerScheduler;
use pocketmine\tile\Chest;
use pocketmine\tile\EnchantTable;
use pocketmine\tile\FlowerPot;
use pocketmine\tile\Furnace;
use pocketmine\tile\ItemFrame;
use pocketmine\tile\Sign;
use pocketmine\tile\Skull;
use pocketmine\tile\Tile; use pocketmine\tile\Tile;
use pocketmine\updater\AutoUpdater; use pocketmine\updater\AutoUpdater;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
@ -1502,8 +1495,8 @@ class Server{
$this->commandMap = new SimpleCommandMap($this); $this->commandMap = new SimpleCommandMap($this);
$this->registerEntities(); $this->registerEntities();
$this->registerTiles();
Tile::init();
InventoryType::init(); InventoryType::init();
Block::init(); Block::init();
Enchantment::init(); Enchantment::init();
@ -2447,15 +2440,4 @@ class Server{
Entity::registerEntity(Human::class, true); Entity::registerEntity(Human::class, true);
} }
private function registerTiles(){
Tile::registerTile(Chest::class);
Tile::registerTile(EnchantTable::class);
Tile::registerTile(FlowerPot::class);
Tile::registerTile(Furnace::class);
Tile::registerTile(ItemFrame::class);
Tile::registerTile(Sign::class);
Tile::registerTile(Skull::class);
}
} }

10
src/pocketmine/tile/Tile.php
View File

@ -67,6 +67,16 @@ abstract class Tile extends Position{
/** @var \pocketmine\event\TimingsHandler */ /** @var \pocketmine\event\TimingsHandler */
public $tickTimer; public $tickTimer;
public static function init(){
self::registerTile(Chest::class);
self::registerTile(EnchantTable::class);
self::registerTile(FlowerPot::class);
self::registerTile(Furnace::class);
self::registerTile(ItemFrame::class);
self::registerTile(Sign::class);
self::registerTile(Skull::class);
}
/** /**
* @param string $type * @param string $type
* @param Chunk $chunk * @param Chunk $chunk