Merge branch 'master' into api3/network

This commit is contained in:
Dylan K. Taylor
2017-03-28 12:27:40 +01:00
4 changed files with 15 additions and 21 deletions

View File

@ -503,17 +503,6 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
}
}
public function despawnFrom(Player $player){
if(isset($this->hasSpawned[$player->getLoaderId()])){
$pk = new RemoveEntityPacket();
$pk->eid = $this->getId();
$player->dataPacket($pk);
unset($this->hasSpawned[$player->getLoaderId()]);
}
}
public function close(){
if(!$this->closed){
if(!($this instanceof Player) or $this->loggedIn){