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

Revert botched fix that broke teleports

Browse Source 
Revert "Do chunk orders and sending during onUpdate() when we know the player has been constructed"

This reverts commit 080b35bf53.
This commit is contained in:
Dylan K. Taylor
2017-06-21 17:51:16 +01:00
parent a0ef15b15e
commit c09a5ab301
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/Player.php
View File

@ -1679,14 +1679,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
return true; return true;
} }
if($this->nextChunkOrderRun-- <= 0 or $this->chunk === null){
$this->orderChunks();
}
if(count($this->loadQueue) > 0 or !$this->spawned){
$this->sendNextChunk();
}
$this->timings->startTiming(); $this->timings->startTiming();
if($this->spawned){ if($this->spawned){
@ -1750,6 +1742,14 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
return; return;
} }
if($this->nextChunkOrderRun-- <= 0 or $this->chunk === null){
$this->orderChunks();
}
if(count($this->loadQueue) > 0 or !$this->spawned){
$this->sendNextChunk();
}
if(count($this->batchedPackets) > 0){ if(count($this->batchedPackets) > 0){
$this->server->batchPackets([$this], $this->batchedPackets, false); $this->server->batchPackets([$this], $this->batchedPackets, false);
$this->batchedPackets = []; $this->batchedPackets = [];