mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 15:49:54 +00:00
Code Issues Projects Releases Wiki Activity

Fixed invalid Position object on teleport

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-01-23 19:02:09 +01:00
parent 4ae1709196
commit f432f110a4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Player.php
View File

@ -887,7 +887,7 @@ class Player{
return false; return false;
} }
if($pos instanceof Position and $pos->level !== $this->level){ if($pos instanceof Position and $pos->level instanceof Level and $pos->level !== $this->level){
if($this->server->api->dhandle("player.teleport.level", array("player" => $this, "origin" => $this->level, "target" => $pos->level)) === false){ if($this->server->api->dhandle("player.teleport.level", array("player" => $this, "origin" => $this->level, "target" => $pos->level)) === false){
$this->entity->check = true; $this->entity->check = true;
return false; return false;

2
src/world/Entity.php
View File

@ -820,7 +820,7 @@ class Entity extends Position{
} }
public function setPosition(Vector3 $pos, $yaw = false, $pitch = false){ public function setPosition(Vector3 $pos, $yaw = false, $pitch = false){
if($pos instanceof Position and $this->level !== $pos->level){ if($pos instanceof Position and $pos->level instanceof Level and $this->level !== $pos->level){
$this->level = $pos->level; $this->level = $pos->level;
$this->server->preparedSQL->entity->setLevel->reset(); $this->server->preparedSQL->entity->setLevel->reset();
$this->server->preparedSQL->entity->setLevel->clear(); $this->server->preparedSQL->entity->setLevel->clear();