From e7d56a837f47e6775d905398a6ddf4b1cfca5a7b Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Thu, 7 Feb 2013 17:04:04 +0100 Subject: [PATCH] Added __toString() to Player, Block and Item classes & added protocol order enforcement after login --- src/classes/Player.php | 52 ++++++++++++++++++++++++++++++++++ src/classes/material/Block.php | 6 ++-- src/classes/material/Item.php | 4 +++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/src/classes/Player.php b/src/classes/Player.php index fe90dcb6..7cb075dc 100644 --- a/src/classes/Player.php +++ b/src/classes/Player.php @@ -549,6 +549,9 @@ class Player{ )); break; case MC_READY: + if($this->loggedIn === false){ + break; + } switch($data["status"]){ case 1: //Spawn!! if($this->spawned !== false){ @@ -623,12 +626,18 @@ class Player{ } break; case MC_MOVE_PLAYER: + if($this->loggedIn === false){ + break; + } if($this->entity instanceof Entity){ $this->entity->setPosition($data["x"], $data["y"], $data["z"], $data["yaw"], $data["pitch"]); $this->server->api->dhandle("player.move", $this->entity); } break; case MC_PLAYER_EQUIPMENT: + if($this->loggedIn === false){ + break; + } $data["eid"] = $this->eid; if($this->server->handle("player.equipment.change", $data) !== false){ $this->equipment = BlockAPI::getItem($data["block"], $data["meta"]); @@ -636,8 +645,14 @@ class Player{ } break; case MC_REQUEST_CHUNK: + if($this->loggedIn === false){ + break; + } break; case MC_USE_ITEM: + if($this->loggedIn === false){ + break; + } $data["eid"] = $this->eid; if(Utils::distance($this->entity->position, $data) > 10){ break; @@ -648,16 +663,25 @@ class Player{ $this->server->api->block->playerBlockAction($this, new Vector3($data["x"], $data["y"], $data["z"]), $data["face"], $data["fx"], $data["fy"], $data["fz"]); break; case MC_REMOVE_BLOCK: + if($this->loggedIn === false){ + break; + } if(Utils::distance($this->entity->position, $data) > 8){ break; } $this->server->api->block->playerBlockBreak($this, new Vector3($data["x"], $data["y"], $data["z"])); break; case MC_PLAYER_ARMOR_EQUIPMENT: + if($this->loggedIn === false){ + break; + } $data["eid"] = $this->eid; $this->server->handle("player.armor", $data); break; case MC_INTERACT: + if($this->loggedIn === false){ + break; + } if(isset($this->server->entities[$data["target"]]) and Utils::distance($this->entity->position, $this->server->entities[$data["target"]]->position) <= 8){ if($this->handle("player.interact", $data) !== false){ console("[DEBUG] EID ".$this->eid." attacked EID ".$data["target"], true, true, 2); @@ -668,9 +692,15 @@ class Player{ } break; case MC_ANIMATE: + if($this->loggedIn === false){ + break; + } $this->server->api->dhandle("entity.animate", array("eid" => $this->eid, "action" => $data["action"])); break; case MC_RESPAWN: + if($this->loggedIn === false){ + break; + } if($this->entity->dead === false){ break; } @@ -681,12 +711,18 @@ class Player{ $this->entity->updateMetadata(); break; case MC_SET_HEALTH: + if($this->loggedIn === false){ + break; + } if($this->gamemode === 1){ break; } //$this->entity->setHealth($data["health"], "client"); break; case MC_ENTITY_EVENT: + if($this->loggedIn === false){ + break; + } $data["eid"] = $this->eid; switch($data["event"]){ case 9: //Eating @@ -711,11 +747,17 @@ class Player{ } break; case MC_DROP_ITEM: + if($this->loggedIn === false){ + break; + } if($this->server->handle("player.drop", $data) !== false){ $this->server->api->block->drop($this->entity->x, $this->entity->y, $this->entity->z, $data["block"], $data["meta"], $data["stack"]); } break; case MC_SIGN_UPDATE: + if($this->loggedIn === false){ + break; + } $t = $this->server->api->tileentity->get($data["x"], $data["y"], $data["z"]); if(($t[0] instanceof TileEntity) and $t[0]->class === TILE_SIGN){ $t = $t[0]; @@ -732,6 +774,9 @@ class Player{ } break; case MC_CHAT: + if($this->loggedIn === false){ + break; + } $message = $data["message"]; if($message{0} === "/"){ //Command $this->server->api->console->run(substr($message, 1), $this); @@ -780,5 +825,12 @@ class Player{ )); } } + + function __toString(){ + if($this->username != ""){ + return $this->username; + } + return $this->clientID; + } } \ No newline at end of file diff --git a/src/classes/material/Block.php b/src/classes/material/Block.php index 49717992..6b3e5f86 100644 --- a/src/classes/material/Block.php +++ b/src/classes/material/Block.php @@ -135,7 +135,6 @@ abstract class Block{ ); protected $id; protected $meta; - protected $shortname = ""; protected $name = ""; public $isActivable = false; public $breakable = true; @@ -154,7 +153,6 @@ abstract class Block{ $this->id = (int) $id; $this->meta = (int) $meta; $this->name = $name; - $this->shortname = strtolower(str_replace(" ", "_", $name)); } public function getName(){ @@ -186,6 +184,10 @@ abstract class Block{ } } + final public function __toString(){ + return $this->name ." (".$this->id.":".$this->meta.")"; + } + abstract function isBreakable(Item $item, Player $player); abstract function onBreak(BlockAPI $level, Item $item, Player $player); diff --git a/src/classes/material/Item.php b/src/classes/material/Item.php index 8def5a66..723665c8 100644 --- a/src/classes/material/Item.php +++ b/src/classes/material/Item.php @@ -123,6 +123,10 @@ class Item{ } } + final public function __toString(){ + return $this->name ." (".$this->id.":".$this->meta.")"; + } + public function getDestroySpeed(Block $block, Player $player){ return 1; }