Improved player spawn item in hand sending

This commit is contained in:
Shoghi Cervantes 2014-11-27 13:59:32 +01:00
parent dd3207cbd8
commit cd135b39ad
2 changed files with 7 additions and 8 deletions

View File

@ -169,8 +169,9 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$pk->z = $this->z; $pk->z = $this->z;
$pk->yaw = $this->yaw; $pk->yaw = $this->yaw;
$pk->pitch = $this->pitch; $pk->pitch = $this->pitch;
$pk->unknown1 = 0; $item = $this->getInventory()->getItemInHand();
$pk->unknown2 = 0; $pk->item = $item->getID();
$pk->meta = $item->getDamage();
$pk->metadata = $this->getData(); $pk->metadata = $this->getData();
$player->dataPacket($pk); $player->dataPacket($pk);
@ -180,8 +181,6 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
]; ];
$player->dataPacket($pk); $player->dataPacket($pk);
$this->inventory->sendHeldItem($player);
$this->inventory->sendArmorContents($player); $this->inventory->sendArmorContents($player);
} }
} }

View File

@ -39,8 +39,8 @@ class AddPlayerPacket extends DataPacket{
public $z; public $z;
public $pitch; public $pitch;
public $yaw; public $yaw;
public $unknown1; public $item;
public $unknown2; public $meta;
public $metadata; public $metadata;
public function pid(){ public function pid(){
@ -61,8 +61,8 @@ class AddPlayerPacket extends DataPacket{
$this->putFloat($this->z); $this->putFloat($this->z);
$this->putByte((int) ($this->yaw * (256 / 360))); $this->putByte((int) ($this->yaw * (256 / 360)));
$this->putByte((int) ($this->pitch * (256 / 360))); $this->putByte((int) ($this->pitch * (256 / 360)));
$this->putShort($this->unknown1); $this->putShort($this->item);
$this->putShort($this->unknown2); $this->putShort($this->meta);
$this->put(Binary::writeMetadata($this->metadata)); $this->put(Binary::writeMetadata($this->metadata));
} }