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

Merge branch 'release/3.1' into release/3.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-08-19 16:01:47 +01:00
commit 2eda8cfad3
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -1028,6 +1028,7 @@ class Server{
return false;
}
/** @see LevelProvider::__construct() */
$level = new Level($this, $name, new $providerClass($path));
$this->levels[$level->getId()] = $level;
@ -1075,6 +1076,7 @@ class Server{
/** @var LevelProvider $providerClass */
$providerClass::generate($path, $name, $seed, $generator, $options);
/** @see LevelProvider::__construct() */
$level = new Level($this, $name, new $providerClass($path));
$this->levels[$level->getId()] = $level;

1
src/pocketmine/entity/Entity.php
View File

@ -285,6 +285,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
public static function createEntity($type, Level $level, CompoundTag $nbt, ...$args) : ?Entity{
if(isset(self::$knownEntities[$type])){
$class = self::$knownEntities[$type];
/** @see Entity::__construct() */
return new $class($level, $nbt, ...$args);
}

5
src/pocketmine/level/generator/GeneratorRegisterTask.php
View File

@ -52,7 +52,10 @@ class GeneratorRegisterTask extends AsyncTask{
$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
$this->saveToThreadStore("generation.level{$this->levelId}.manager", $manager);
/** @var Generator $generator */
/**
* @var Generator $generator
* @see Generator::__construct()
*/
$generator = new $this->generatorClass(unserialize($this->settings));
$generator->init($manager, new Random($manager->getSeed()));
$this->saveToThreadStore("generation.level{$this->levelId}.generator", $generator);

4
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -141,6 +141,10 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
$this->server->getPluginManager()->callEvent($ev);
$class = $ev->getPlayerClass();
/**
* @var Player $player
* @see Player::__construct()
*/
$player = new $class($this, $ev->getAddress(), $ev->getPort());
$this->players[$identifier] = $player;
$this->identifiersACK[$identifier] = 0;

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

@ -103,6 +103,7 @@ abstract class Tile extends Position{
public static function createTile($type, Level $level, CompoundTag $nbt, ...$args) : ?Tile{
if(isset(self::$knownTiles[$type])){
$class = self::$knownTiles[$type];
/** @see Tile::__construct() */
return new $class($level, $nbt, ...$args);
}