From 6d2eea8887d60ed20adccaeb162a4aa6f0f54b27 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sat, 7 Sep 2013 12:05:04 +0200 Subject: [PATCH] Level::getSafeSpawn() on player normal spawn --- src/Player.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Player.php b/src/Player.php index 9fafff7dc..ef7f316ef 100644 --- a/src/Player.php +++ b/src/Player.php @@ -1298,10 +1298,12 @@ class Player{ $this->dataPacket(MC_SET_TIME, array( "time" => $this->level->getTime(), )); - $this->teleport(new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level)); - $this->server->schedule(10, array($this, "teleport"), new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level)); - $this->server->schedule(20, array($this, "teleport"), new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level)); - $this->server->schedule(30, array($this, "teleport"), new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level)); + $pos = new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level); + $pos = $this->level->getSafeSpawn($pos); + $this->teleport($pos); + $this->server->schedule(10, array($this, "teleport"), $pos); + $this->server->schedule(20, array($this, "teleport"), $pos); + $this->server->schedule(30, array($this, "teleport"), $pos); $this->server->handle("player.spawn", $this); break; case 2://Chunk loaded?