diff --git a/src/network/PacketPool.php b/src/network/PacketPool.php index 64158e1c..d1ea5680 100644 --- a/src/network/PacketPool.php +++ b/src/network/PacketPool.php @@ -69,7 +69,7 @@ class PacketPool{ self::registerPacket(DisconnectPacket::class); self::registerPacket(DropItemPacket::class); - self::registerPacket(EntityDataPacket::class, [12, 13, 14]); + self::registerPacket(EntityDataPacket::class, [6, 7, 8, 9, 10, 11, 12, 13, 14]); self::registerPacket(EntityEventPacket::class); self::registerPacket(ExplodePacket::class); @@ -110,7 +110,6 @@ class PacketPool{ self::registerPacket(SetHealthPacket::class); self::registerPacket(SetSpawnPositionPacket::class, [8, 9, 10, 11, 12, 13, 14]); self::registerPacket(SetTimePacket::class); - self::registerPacket(SignUpdatePacket::class, [6, 7, 8, 9]); self::registerPacket(StartGamePacket::class); self::registerPacket(TakeItemEntityPacket::class); diff --git a/src/network/protocol/ProtocolInfo.php b/src/network/protocol/ProtocolInfo.php index 06e6b0ad..b2562618 100644 --- a/src/network/protocol/ProtocolInfo.php +++ b/src/network/protocol/ProtocolInfo.php @@ -210,9 +210,8 @@ abstract class ProtocolInfo9{ const CONTAINER_SET_CONTENT_PACKET = 0xb2; const CONTAINER_ACK_PACKET = 0xb3; const CHAT_PACKET = 0xb4; - const SIGN_UPDATE_PACKET = 0xb5; + const ENTITY_DATA_PACKET = 0xb5; const ADVENTURE_SETTINGS_PACKET = 0xb6; - } abstract class ProtocolInfo8{ @@ -277,7 +276,7 @@ abstract class ProtocolInfo8{ const CONTAINER_SET_CONTENT_PACKET = 0xaf; const CONTAINER_ACK_PACKET = 0xb; const CHAT_PACKET = 0xb1; - const SIGN_UPDATE_PACKET = 0xb2; + const ENTITY_DATA_PACKET = 0xb2; const ADVENTURE_SETTINGS_PACKET = 0xb3; } abstract class ProtocolInfo6{ @@ -343,7 +342,7 @@ abstract class ProtocolInfo6{ const CONTAINER_SET_CONTENT_PACKET = 0xad; const CONTAINER_ACK_PACKET = 0xae; const CHAT_PACKET = 0xaf; - const SIGN_UPDATE_PACKET = 0xb0; + const ENTITY_DATA_PACKET = 0xb0; //const ADVENTURE_SETTINGS_PACKET = 0xb3; } abstract class ProtocolInfo4{ diff --git a/src/network/protocol/packet/EntityDataPacket.php b/src/network/protocol/packet/EntityDataPacket.php index 0878b958..5d31d7e0 100644 --- a/src/network/protocol/packet/EntityDataPacket.php +++ b/src/network/protocol/packet/EntityDataPacket.php @@ -7,7 +7,13 @@ class EntityDataPacket extends RakNetDataPacket{ public $namedtag; public function pid(){ - if($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ + if($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::ENTITY_DATA_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9) { + return ProtocolInfo8::ENTITY_DATA_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12) { + return ProtocolInfo9::ENTITY_DATA_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::ENTITY_DATA_PACKET; } return ProtocolInfo::ENTITY_DATA_PACKET; @@ -26,6 +32,7 @@ class EntityDataPacket extends RakNetDataPacket{ $this->putByte($this->y); $this->putShort($this->z); $this->put($this->namedtag); + console($this->namedtag); } } \ No newline at end of file diff --git a/src/network/protocol/packet/SignUpdatePacket.php b/src/network/protocol/packet/SignUpdatePacket.php deleted file mode 100644 index 1ba4542d..00000000 --- a/src/network/protocol/packet/SignUpdatePacket.php +++ /dev/null @@ -1,34 +0,0 @@ -PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ - return ProtocolInfo6::SIGN_UPDATE_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo9::SIGN_UPDATE_PACKET) { - return ProtocolInfo8::SIGN_UPDATE_PACKET; - } - return ProtocolInfo9::SIGN_UPDATE_PACKET; - } - - public function decode(){ - //$this->reset(); - $this->x = $this->getShort(); - $this->y = $this->getByte(); - $this->z = $this->getShort(); - $this->content = $this->getString(); - } - - public function encode(){ - //$this->reset(); - $this->putShort($this->x); - $this->putByte($this->y); - $this->putShort($this->z); - $this->putString($this->content); - } - -} \ No newline at end of file