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

Fixed inventory being sent before spawning

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-14 16:27:04 +02:00
parent ebe8a902e5
commit 6e77901453
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/Player.php
View File

@ -625,10 +625,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->spawned = true; $this->spawned = true;
$this->sendSettings();
$this->inventory->sendContents($this);
$this->inventory->sendArmorContents($this);
$this->blocked = false; $this->blocked = false;
$pk = new SetTimePacket; $pk = new SetTimePacket;
@ -643,6 +639,10 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->teleport($ev->getRespawnPosition()); $this->teleport($ev->getRespawnPosition());
$this->sendSettings();
$this->inventory->sendContents($this);
$this->inventory->sendArmorContents($this);
$this->spawnToAll(); $this->spawnToAll();
$this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this, TextFormat::YELLOW . $this->getName() . " joined the game")); $this->server->getPluginManager()->callEvent($ev = new PlayerJoinEvent($this, TextFormat::YELLOW . $this->getName() . " joined the game"));

2
src/pocketmine/inventory/BaseInventory.php
View File

@ -392,7 +392,7 @@ abstract class BaseInventory implements Inventory{
} }
foreach($target as $player){ foreach($target as $player){
if(($id = $player->getWindowId($this)) === -1){ if(($id = $player->getWindowId($this)) === -1 or $player->spawned !== true){
$this->close($player); $this->close($player);
continue; continue;
} }

2
src/pocketmine/inventory/PlayerInventory.php
View File

@ -333,7 +333,7 @@ class PlayerInventory extends BaseInventory{
$pk->hotbar[] = $index <= -1 ? -1 : $index + 9; $pk->hotbar[] = $index <= -1 ? -1 : $index + 9;
} }
} }
if(($id = $player->getWindowId($this)) === -1){ if(($id = $player->getWindowId($this)) === -1 or $player->spawned !== true){
$this->close($player); $this->close($player);
continue; continue;
} }