mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-12 06:25:32 +00:00
Merge branch 'release/3.1' into release/3.2
This commit is contained in:
commit
2eda8cfad3
@ -1028,6 +1028,7 @@ class Server{
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @see LevelProvider::__construct() */
|
||||||
$level = new Level($this, $name, new $providerClass($path));
|
$level = new Level($this, $name, new $providerClass($path));
|
||||||
|
|
||||||
$this->levels[$level->getId()] = $level;
|
$this->levels[$level->getId()] = $level;
|
||||||
@ -1075,6 +1076,7 @@ class Server{
|
|||||||
/** @var LevelProvider $providerClass */
|
/** @var LevelProvider $providerClass */
|
||||||
$providerClass::generate($path, $name, $seed, $generator, $options);
|
$providerClass::generate($path, $name, $seed, $generator, $options);
|
||||||
|
|
||||||
|
/** @see LevelProvider::__construct() */
|
||||||
$level = new Level($this, $name, new $providerClass($path));
|
$level = new Level($this, $name, new $providerClass($path));
|
||||||
$this->levels[$level->getId()] = $level;
|
$this->levels[$level->getId()] = $level;
|
||||||
|
|
||||||
|
@ -285,6 +285,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
|
|||||||
public static function createEntity($type, Level $level, CompoundTag $nbt, ...$args) : ?Entity{
|
public static function createEntity($type, Level $level, CompoundTag $nbt, ...$args) : ?Entity{
|
||||||
if(isset(self::$knownEntities[$type])){
|
if(isset(self::$knownEntities[$type])){
|
||||||
$class = self::$knownEntities[$type];
|
$class = self::$knownEntities[$type];
|
||||||
|
/** @see Entity::__construct() */
|
||||||
return new $class($level, $nbt, ...$args);
|
return new $class($level, $nbt, ...$args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,10 @@ class GeneratorRegisterTask extends AsyncTask{
|
|||||||
$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
|
$manager = new SimpleChunkManager($this->seed, $this->worldHeight);
|
||||||
$this->saveToThreadStore("generation.level{$this->levelId}.manager", $manager);
|
$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 = new $this->generatorClass(unserialize($this->settings));
|
||||||
$generator->init($manager, new Random($manager->getSeed()));
|
$generator->init($manager, new Random($manager->getSeed()));
|
||||||
$this->saveToThreadStore("generation.level{$this->levelId}.generator", $generator);
|
$this->saveToThreadStore("generation.level{$this->levelId}.generator", $generator);
|
||||||
|
@ -141,6 +141,10 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
|
|||||||
$this->server->getPluginManager()->callEvent($ev);
|
$this->server->getPluginManager()->callEvent($ev);
|
||||||
$class = $ev->getPlayerClass();
|
$class = $ev->getPlayerClass();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var Player $player
|
||||||
|
* @see Player::__construct()
|
||||||
|
*/
|
||||||
$player = new $class($this, $ev->getAddress(), $ev->getPort());
|
$player = new $class($this, $ev->getAddress(), $ev->getPort());
|
||||||
$this->players[$identifier] = $player;
|
$this->players[$identifier] = $player;
|
||||||
$this->identifiersACK[$identifier] = 0;
|
$this->identifiersACK[$identifier] = 0;
|
||||||
|
@ -103,6 +103,7 @@ abstract class Tile extends Position{
|
|||||||
public static function createTile($type, Level $level, CompoundTag $nbt, ...$args) : ?Tile{
|
public static function createTile($type, Level $level, CompoundTag $nbt, ...$args) : ?Tile{
|
||||||
if(isset(self::$knownTiles[$type])){
|
if(isset(self::$knownTiles[$type])){
|
||||||
$class = self::$knownTiles[$type];
|
$class = self::$knownTiles[$type];
|
||||||
|
/** @see Tile::__construct() */
|
||||||
return new $class($level, $nbt, ...$args);
|
return new $class($level, $nbt, ...$args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user