From 2d9c4003925d747121a22519341b75187a0da723 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Tue, 25 Dec 2012 17:25:48 +0100 Subject: [PATCH] Show blocks in hand to other players --- classes/Entity.class.php | 5 +++++ classes/Player.class.php | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/classes/Entity.class.php b/classes/Entity.class.php index 38649a2d..01d7ca43 100644 --- a/classes/Entity.class.php +++ b/classes/Entity.class.php @@ -111,6 +111,11 @@ class Entity extends stdClass{ "y" => $this->y, "z" => $this->z, )); + $player->dataPacket(MC_PLAYER_EQUIPMENT, array( + "eid" => $this->eid, + "block" => $this->player->equipment[0], + "meta" => $this->player->equipment[1], + )); break; case ENTITY_ITEM: $player->dataPacket(MC_ADD_ITEM_ENTITY, array( diff --git a/classes/Player.class.php b/classes/Player.class.php index 6c056dd2..c0940d5d 100644 --- a/classes/Player.class.php +++ b/classes/Player.class.php @@ -28,7 +28,7 @@ the Free Software Foundation, either version 3 of the License, or class Player{ private $server, $timeout, $connected, $evid, $queue, $buffer; - var $clientID, $ip, $port, $counter, $username, $eid, $data, $entity, $auth, $CID, $MTU, $spawned; + var $clientID, $ip, $port, $counter, $username, $eid, $data, $entity, $auth, $CID, $MTU, $spawned, $equipment; function __construct($server, $clientID, $ip, $port, $MTU){ $this->queue = array(); $this->buffer = array(); @@ -43,6 +43,7 @@ class Player{ $this->port = $port; $this->timeout = microtime(true) + 25; $this->evid = array(); + $this->equipment = array(1, 0); $this->spawned = false; $this->evid[] = $this->server->event("server.tick", array($this, "onTick")); $this->evid[] = $this->server->event("server.close", array($this, "close")); @@ -112,6 +113,12 @@ class Player{ public function eventHandler($data, $event){ switch($event){ + case "player.equipment.change": + if($data["eid"] === $this->eid){ + break; + } + $this->dataPacket(MC_PLAYER_EQUIPMENT, $data); + break; case "world.block.change": $this->dataPacket(MC_UPDATE_BLOCK, $data); break; @@ -278,6 +285,7 @@ class Player{ $this->evid[] = $this->server->event("entity.remove", array($this, "eventHandler")); $this->evid[] = $this->server->event("entity.move", array($this, "eventHandler")); $this->evid[] = $this->server->event("entity.animate", array($this, "eventHandler")); + $this->evid[] = $this->server->event("player.equipment.change", array($this, "eventHandler")); $this->evid[] = $this->server->event("world.block.change", array($this, "eventHandler")); console("[DEBUG] Player with EID ".$this->eid." \"".$this->username."\" spawned!", true, true, 2); @@ -294,6 +302,10 @@ class Player{ break; case MC_PLAYER_EQUIPMENT: console("[DEBUG] EID ".$this->eid." has now ".$data["block"].":".$data["meta"]." in their hands!", true, true, 2); + $data["eid"] = $this->eid; + $this->equipment[0] = $data["block"]; + $this->equipment[1] = $data["meta"]; + $this->server->trigger("player.equipment.change", $data); break; case MC_REQUEST_CHUNK: $this->actionQueue('