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

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-02 15:04:23 +01:00
commit 732e27751c
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/Server.php
View File

@ -1692,6 +1692,12 @@ class Server{
Item::initCreativeItems(); Item::initCreativeItems();
Biome::init(); Biome::init();
LevelProviderManager::init();
if(extension_loaded("leveldb")){
$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
}
GeneratorManager::registerDefaultGenerators();
$this->craftingManager = new CraftingManager(); $this->craftingManager = new CraftingManager();
$this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR, $this->logger); $this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR, $this->logger);
@ -1713,13 +1719,6 @@ class Server{
$this->network->registerInterface(new RakLibInterface($this)); $this->network->registerInterface(new RakLibInterface($this));
LevelProviderManager::init();
if(extension_loaded("leveldb")){
$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
}
GeneratorManager::registerDefaultGenerators();
foreach((array) $this->getProperty("worlds", []) as $name => $options){ foreach((array) $this->getProperty("worlds", []) as $name => $options){
if($options === null){ if($options === null){
$options = []; $options = [];

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

@ -593,6 +593,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
throw new \InvalidStateException("Cannot create entities in unloaded chunks"); throw new \InvalidStateException("Cannot create entities in unloaded chunks");
} }
$this->motion = new Vector3(0, 0, 0);
if($this->namedtag->hasTag("Motion", ListTag::class)){ if($this->namedtag->hasTag("Motion", ListTag::class)){
/** @var float[] $motion */ /** @var float[] $motion */
$motion = $this->namedtag->getListTag("Motion")->getAllValues(); $motion = $this->namedtag->getListTag("Motion")->getAllValues();

11
src/pocketmine/level/Level.php
View File

@ -112,6 +112,8 @@ use function trim;
use const INT32_MAX; use const INT32_MAX;
use const INT32_MIN; use const INT32_MIN;
use const M_PI; use const M_PI;
use const PHP_INT_MAX;
use const PHP_INT_MIN;
#include <rules/Level.h> #include <rules/Level.h>
@ -762,7 +764,7 @@ class Level implements ChunkManager, Metadatable{
*/ */
public function sendTime(Player ...$targets){ public function sendTime(Player ...$targets){
$pk = new SetTimePacket(); $pk = new SetTimePacket();
$pk->time = $this->time; $pk->time = $this->time & 0xffffffff; //avoid overflowing the field, since the packet uses an int32
$this->server->broadcastPacket(count($targets) > 0 ? $targets : $this->players, $pk); $this->server->broadcastPacket(count($targets) > 0 ? $targets : $this->players, $pk);
} }
@ -790,7 +792,12 @@ class Level implements ChunkManager, Metadatable{
protected function actuallyDoTick(int $currentTick) : void{ protected function actuallyDoTick(int $currentTick) : void{
if(!$this->stopTime){ if(!$this->stopTime){
$this->time++; //this simulates an overflow, as would happen in any language which doesn't do stupid things to var types
if($this->time === PHP_INT_MAX){
$this->time = PHP_INT_MIN;
}else{
$this->time++;
}
} }
$this->sunAnglePercentage = $this->computeSunAnglePercentage(); //Sun angle depends on the current time $this->sunAnglePercentage = $this->computeSunAnglePercentage(); //Sun angle depends on the current time