mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 16:49:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-0.12

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-08-31 17:51:07 +02:00
commit bdf5c46793
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,7 +872,7 @@ class Level implements ChunkManager, Metadatable{
} }
if(count($this->blockCache) > 2048){ if(count($this->blockCache) > 2048){
$this->chunkCache = []; $this->blockCache = [];
} }
} }
@ -2340,7 +2340,7 @@ class Level implements ChunkManager, Metadatable{
$this->server->getPluginManager()->callEvent(new SpawnChangeEvent($this, $previousSpawn)); $this->server->getPluginManager()->callEvent(new SpawnChangeEvent($this, $previousSpawn));
} }
public function requestChunk($x, $z, Player $player, $order = LevelProvider::ORDER_ZXY){ public function requestChunk($x, $z, Player $player){
$index = Level::chunkHash($x, $z); $index = Level::chunkHash($x, $z);
if(!isset($this->chunkSendQueue[$index])){ if(!isset($this->chunkSendQueue[$index])){
$this->chunkSendQueue[$index] = []; $this->chunkSendQueue[$index] = [];

2
src/pocketmine/utils/ServerKiller.php
View File

@ -33,7 +33,7 @@ class ServerKiller extends Thread{
public function run(){ public function run(){
sleep($this->time); sleep($this->time);
echo "\nTook to long to stop, server was killed forcefully!\n"; echo "\nTook too long to stop, server was killed forcefully!\n";
@\pocketmine\kill(getmypid()); @\pocketmine\kill(getmypid());
} }