Merge branch 'master' of github.com:PocketMine/PocketMine-MP

This commit is contained in:
Shoghi Cervantes
2014-08-18 13:51:21 +02:00

View File

@@ -285,7 +285,9 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
return;
}
unset($this->hiddenPlayers[$player->getName()]);
$player->spawnTo($this);
if($player->isOnline()){
$player->spawnTo($this);
}
}
/**
@@ -2375,4 +2377,4 @@ if(is_numeric($data["cause"])){
}
}
Player::broadcastMessage($data["player"]->getName() . $message);
*/
*/