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

Spawning mechanics change

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-14 01:04:17 +02:00
parent 547aa2ae31
commit bd560ab3b1
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/Player.php
View File

@ -276,7 +276,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
* @param Player $player * @param Player $player
*/ */
public function spawnTo(Player $player){ public function spawnTo(Player $player){
if($this->spawned === true and $this->dead !== true and $player->dead !== true and $player->getLevel() === $this->level and $player->canSee($this)){ if($this->spawned === true and $player->spawned === true and $this->dead !== true and $player->dead !== true and $player->getLevel() === $this->level and $player->canSee($this)){
parent::spawnTo($player); parent::spawnTo($player);
} }
} }
@ -591,9 +591,11 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$pk->data = $payload; $pk->data = $payload;
$this->dataPacket($pk); $this->dataPacket($pk);
foreach($this->level->getChunkEntities($x, $z) as $entity){ if($this->spawned){
if($entity !== $this and !$entity->closed and !$entity->dead){ foreach($this->level->getChunkEntities($x, $z) as $entity){
$entity->spawnTo($this); if($entity !== $this and !$entity->closed and !$entity->dead){
$entity->spawnTo($this);
}
} }
} }
} }
@ -662,6 +664,15 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$this->noDamageTicks = 60; $this->noDamageTicks = 60;
foreach($this->usedChunks as $index => $c){
Level::getXZ($index, $chunkX, $chunkZ);
foreach($this->level->getChunkEntities($chunkX, $chunkZ) as $entity){
if($entity !== $this and !$entity->closed and !$entity->dead){
$entity->spawnTo($this);
}
}
}
$this->spawnToAll(); $this->spawnToAll();
if($this->server->getUpdater()->hasUpdate() and $this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){ if($this->server->getUpdater()->hasUpdate() and $this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){