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

Workaround for bad calls to teleport, closes #3074

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-05-29 10:17:27 +02:00
parent 1e2038fac5
commit eaa42f8449
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/Player.php
View File

@ -907,6 +907,10 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
* @return boolean * @return boolean
*/ */
public function sleepOn(Vector3 $pos){ public function sleepOn(Vector3 $pos){
if(!$this->isOnline()){
return false;
}
foreach($this->level->getNearbyEntities($this->boundingBox->grow(2, 1, 2), $this) as $p){ foreach($this->level->getNearbyEntities($this->boundingBox->grow(2, 1, 2), $this) as $p){
if($p instanceof Player){ if($p instanceof Player){
if($p->sleeping !== null and $pos->distance($p->sleeping) <= 0.1){ if($p->sleeping !== null and $pos->distance($p->sleeping) <= 0.1){
@ -2040,7 +2044,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->stopSleep(); $this->stopSleep();
break; break;
case 7: //Respawn case 7: //Respawn
if($this->spawned === false or $this->isAlive()){ if($this->spawned === false or $this->isAlive() or !$this->isOnline()){
break; break;
} }
@ -3069,6 +3073,10 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
} }
public function teleport(Vector3 $pos, $yaw = null, $pitch = null){ public function teleport(Vector3 $pos, $yaw = null, $pitch = null){
if(!$this->isOnline()){
return;
}
$oldPos = $this->getPosition(); $oldPos = $this->getPosition();
if(parent::teleport($pos, $yaw, $pitch)){ if(parent::teleport($pos, $yaw, $pitch)){