From 9903b8b31b3b808e2e8823eecfbbce5950a51c71 Mon Sep 17 00:00:00 2001 From: yefengeeeeeeeeeee <403749250@qq.com> Date: Sat, 3 May 2025 13:27:46 +0800 Subject: [PATCH] Fixed Wrong ProtocolVersion && Some Packet Fixed --- src/Player.php | 2 +- src/network/PacketPool.php | 14 +++++++------- src/network/protocol/ProtocolInfo.php | 8 ++++---- .../protocol/packet/AddEntityPacket.php | 2 +- .../protocol/packet/AddItemEntityPacket.php | 2 +- .../packet/AdventureSettingsPacket.php | 2 +- src/network/protocol/packet/AnimatePacket.php | 8 ++++---- src/network/protocol/packet/ChatPacket.php | 6 +++--- .../protocol/packet/ChunkDataPacket.php | 6 +++--- .../protocol/packet/ContainerAckPacket.php | 8 ++++---- .../protocol/packet/ContainerClosePacket.php | 8 ++++---- .../protocol/packet/ContainerOpenPacket.php | 18 +++++++++++------- .../packet/ContainerSetContentPacket.php | 8 ++++---- .../protocol/packet/ContainerSetDataPacket.php | 8 ++++---- .../protocol/packet/ContainerSetSlotPacket.php | 8 ++++---- src/network/protocol/packet/DropItemPacket.php | 8 ++++---- .../protocol/packet/EntityDataPacket.php | 2 +- .../protocol/packet/EntityEventPacket.php | 6 +++--- src/network/protocol/packet/ExplodePacket.php | 6 +++--- src/network/protocol/packet/InteractPacket.php | 8 ++++---- .../protocol/packet/LevelEventPacket.php | 6 +++--- .../protocol/packet/MoveEntityPacket.php | 2 +- .../packet/MoveEntityPacket_PosRot.php | 2 +- .../protocol/packet/MovePlayerPacket.php | 2 +- .../protocol/packet/PlaceBlockPacket.php | 2 +- .../protocol/packet/PlayerActionPacket.php | 6 +++--- .../protocol/packet/PlayerEquipmentPacket.php | 6 +++--- .../protocol/packet/RemoveBlockPacket.php | 2 +- .../protocol/packet/RemoveEntityPacket.php | 2 +- .../protocol/packet/RequestChunkPacket.php | 6 +++--- src/network/protocol/packet/RespawnPacket.php | 8 ++++---- .../protocol/packet/SendInventoryPacket.php | 8 ++++---- .../protocol/packet/SetEntityDataPacket.php | 10 +++++----- .../protocol/packet/SetEntityMotionPacket.php | 8 ++++---- .../protocol/packet/SetHealthPacket.php | 8 ++++---- .../protocol/packet/SetSpawnPositionPacket.php | 2 +- .../protocol/packet/TakeItemEntityPacket.php | 2 +- .../protocol/packet/TileEventPacket.php | 6 +++--- .../protocol/packet/UpdateBlockPacket.php | 2 +- src/network/protocol/packet/UseItemPacket.php | 8 ++++---- 40 files changed, 120 insertions(+), 116 deletions(-) diff --git a/src/Player.php b/src/Player.php index 43092aa1..f3e02972 100755 --- a/src/Player.php +++ b/src/Player.php @@ -358,7 +358,7 @@ class Player{ $packet->PROTOCOL = $this->PROTOCOL; $packet->encode(); - if($packet->pid() == 163 or $packet->pid() == 164 && $this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ + if($packet->pid() == 163 or $packet->pid() == 164 && $this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ return; } $len = strlen($packet->buffer) + 1; diff --git a/src/network/PacketPool.php b/src/network/PacketPool.php index 83c7eb4c..8774e022 100644 --- a/src/network/PacketPool.php +++ b/src/network/PacketPool.php @@ -50,12 +50,12 @@ class PacketPool{ self::registerPacket(AddEntityPacket::class); self::registerPacket(AddItemEntityPacket::class); self::registerPacket(AddMobPacket::class); - self::registerPacket(AddPaintingPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(AddPaintingPacket::class, [8, 9, 10, 11, 12, 13, 14]); self::registerPacket(AddPlayerPacket::class); - self::registerPacket(AdventureSettingsPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(AdventureSettingsPacket::class, [8, 9, 10, 11, 12, 13, 14]); self::registerPacket(AnimatePacket::class); - self::registerPacket(ChatPacket::class, [5, 6, 7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(ChatPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); self::registerPacket(ChunkDataPacket::class); self::registerPacket(ClientConnectPacket::class); self::registerPacket(ClientHandshakePacket::class); @@ -69,7 +69,7 @@ class PacketPool{ self::registerPacket(DisconnectPacket::class); self::registerPacket(DropItemPacket::class); - self::registerPacket(EntityDataPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(EntityDataPacket::class, [8, 9, 10, 11, 12, 13, 14]); self::registerPacket(EntityEventPacket::class); self::registerPacket(ExplodePacket::class); @@ -88,10 +88,10 @@ class PacketPool{ self::registerPacket(PingPacket::class); self::registerPacket(PlaceBlockPacket::class); - self::registerPacket(PlayerActionPacket::class, [5, 6, 7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(PlayerActionPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); self::registerPacket(PlayerArmorEquipmentPacket::class, [9, 10, 11, 12, 13, 14]); self::registerPacket(PlayerEquipmentPacket::class); - self::registerPacket(PlayerInputPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(PlayerInputPacket::class, [8, 9, 10, 11, 12, 13, 14]); self::registerPacket(PongPacket::class); self::registerPacket(ReadyPacket::class); @@ -108,7 +108,7 @@ class PacketPool{ self::registerPacket(SetEntityLinkPacket::class, [12, 13, 14]); self::registerPacket(SetEntityMotionPacket::class, [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]); self::registerPacket(SetHealthPacket::class); - self::registerPacket(SetSpawnPositionPacket::class, [7, 8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(SetSpawnPositionPacket::class, [8, 9, 10, 11, 12, 13, 14]); self::registerPacket(SetTimePacket::class); self::registerPacket(StartGamePacket::class); diff --git a/src/network/protocol/ProtocolInfo.php b/src/network/protocol/ProtocolInfo.php index 81f4986f..708fa6ec 100644 --- a/src/network/protocol/ProtocolInfo.php +++ b/src/network/protocol/ProtocolInfo.php @@ -216,9 +216,9 @@ abstract class ProtocolInfo9{ const PLAYER_INPUT_PACKET = 0xb9; } -abstract class ProtocolInfo7{ +abstract class ProtocolInfo8{ - const CURRENT_PROTOCOL_7 = 7; + const CURRENT_PROTOCOL_8 = 8; const PING_PACKET = 0x00; @@ -283,9 +283,9 @@ abstract class ProtocolInfo7{ const ENTITY_DATA_PACKET = 0xb2; const PLAYER_INPUT_PACKET = 0xb9; } -abstract class ProtocolInfo5{ +abstract class ProtocolInfo6{ - const CURRENT_PROTOCOL_5 = 5; + const CURRENT_PROTOCOL_6 = 6; const PING_PACKET = 0x00; diff --git a/src/network/protocol/packet/AddEntityPacket.php b/src/network/protocol/packet/AddEntityPacket.php index 93b3abc6..d01d2fd7 100644 --- a/src/network/protocol/packet/AddEntityPacket.php +++ b/src/network/protocol/packet/AddEntityPacket.php @@ -12,7 +12,7 @@ class AddEntityPacket extends RakNetDataPacket{ public $speedZ; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::ADD_ENTITY_PACKET; } return ProtocolInfo::ADD_ENTITY_PACKET; diff --git a/src/network/protocol/packet/AddItemEntityPacket.php b/src/network/protocol/packet/AddItemEntityPacket.php index 8e10eba3..0ba0e2c6 100644 --- a/src/network/protocol/packet/AddItemEntityPacket.php +++ b/src/network/protocol/packet/AddItemEntityPacket.php @@ -11,7 +11,7 @@ class AddItemEntityPacket extends RakNetDataPacket{ public $roll; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::ADD_ITEM_ENTITY_PACKET; } return ProtocolInfo::ADD_ITEM_ENTITY_PACKET; diff --git a/src/network/protocol/packet/AdventureSettingsPacket.php b/src/network/protocol/packet/AdventureSettingsPacket.php index 8c1937e4..c19c89da 100644 --- a/src/network/protocol/packet/AdventureSettingsPacket.php +++ b/src/network/protocol/packet/AdventureSettingsPacket.php @@ -5,7 +5,7 @@ class AdventureSettingsPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::ADVENTURE_SETTINGS_PACKET; + return ProtocolInfo8::ADVENTURE_SETTINGS_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::ADVENTURE_SETTINGS_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/AnimatePacket.php b/src/network/protocol/packet/AnimatePacket.php index 1222d2a8..84b980cf 100644 --- a/src/network/protocol/packet/AnimatePacket.php +++ b/src/network/protocol/packet/AnimatePacket.php @@ -10,12 +10,12 @@ class AnimatePacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::ANIMATE_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::ANIMATE_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::ANIMATE_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::ANIMATE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::ANIMATE_PACKET; + return ProtocolInfo8::ANIMATE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::ANIMATE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/ChatPacket.php b/src/network/protocol/packet/ChatPacket.php index 4d4b10dd..cc750b03 100644 --- a/src/network/protocol/packet/ChatPacket.php +++ b/src/network/protocol/packet/ChatPacket.php @@ -4,10 +4,10 @@ class ChatPacket extends RakNetDataPacket{ public $message; public function pid(){ - if($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CHAT_PACKET; + if($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CHAT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CHAT_PACKET; + return ProtocolInfo8::CHAT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CHAT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/ChunkDataPacket.php b/src/network/protocol/packet/ChunkDataPacket.php index c727f583..1c6cbe1e 100644 --- a/src/network/protocol/packet/ChunkDataPacket.php +++ b/src/network/protocol/packet/ChunkDataPacket.php @@ -8,10 +8,10 @@ class ChunkDataPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::CHUNK_DATA_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CHUNK_DATA_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CHUNK_DATA_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CHUNK_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::CHUNK_DATA_PACKET; } diff --git a/src/network/protocol/packet/ContainerAckPacket.php b/src/network/protocol/packet/ContainerAckPacket.php index ae42a290..93309e64 100644 --- a/src/network/protocol/packet/ContainerAckPacket.php +++ b/src/network/protocol/packet/ContainerAckPacket.php @@ -7,12 +7,12 @@ class ContainerAckPacket extends RakNetDataPacket{ public $write0; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CONTAINER_ACK_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CONTAINER_ACK_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CONTAINER_ACK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CONTAINER_ACK_PACKET; + return ProtocolInfo8::CONTAINER_ACK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CONTAINER_ACK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/ContainerClosePacket.php b/src/network/protocol/packet/ContainerClosePacket.php index 913fcdb4..be516472 100644 --- a/src/network/protocol/packet/ContainerClosePacket.php +++ b/src/network/protocol/packet/ContainerClosePacket.php @@ -6,12 +6,12 @@ class ContainerClosePacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::CONTAINER_CLOSE_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CONTAINER_CLOSE_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CONTAINER_CLOSE_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CONTAINER_CLOSE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CONTAINER_CLOSE_PACKET; + return ProtocolInfo8::CONTAINER_CLOSE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CONTAINER_CLOSE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/ContainerOpenPacket.php b/src/network/protocol/packet/ContainerOpenPacket.php index 8c6f44da..afdb66ed 100644 --- a/src/network/protocol/packet/ContainerOpenPacket.php +++ b/src/network/protocol/packet/ContainerOpenPacket.php @@ -11,12 +11,12 @@ class ContainerOpenPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::CONTAINER_OPEN_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CONTAINER_OPEN_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CONTAINER_OPEN_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CONTAINER_OPEN_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CONTAINER_OPEN_PACKET; + return ProtocolInfo8::CONTAINER_OPEN_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CONTAINER_OPEN_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ @@ -34,9 +34,13 @@ class ContainerOpenPacket extends RakNetDataPacket{ $this->putByte($this->windowid); $this->putByte($this->type); $this->putByte($this->slots); - $this->putInt($this->x);//String - $this->putInt($this->y); - $this->putInt($this->z); + if ($this->PROTOCOL <= ProtocolInfo9::CURRENT_PROTOCOL_9){ + $this->putString(); + }else{ + $this->putInt($this->x); + $this->putInt($this->y); + $this->putInt($this->z); + } } } \ No newline at end of file diff --git a/src/network/protocol/packet/ContainerSetContentPacket.php b/src/network/protocol/packet/ContainerSetContentPacket.php index 663187b5..97a5ce78 100644 --- a/src/network/protocol/packet/ContainerSetContentPacket.php +++ b/src/network/protocol/packet/ContainerSetContentPacket.php @@ -8,12 +8,12 @@ class ContainerSetContentPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::CONTAINER_SET_CONTENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CONTAINER_SET_CONTENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CONTAINER_SET_CONTENT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CONTAINER_SET_CONTENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CONTAINER_SET_CONTENT_PACKET; + return ProtocolInfo8::CONTAINER_SET_CONTENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CONTAINER_SET_CONTENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/ContainerSetDataPacket.php b/src/network/protocol/packet/ContainerSetDataPacket.php index 1a6c73ea..50cbaa1e 100644 --- a/src/network/protocol/packet/ContainerSetDataPacket.php +++ b/src/network/protocol/packet/ContainerSetDataPacket.php @@ -8,12 +8,12 @@ class ContainerSetDataPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::CONTAINER_SET_DATA_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CONTAINER_SET_DATA_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CONTAINER_SET_DATA_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CONTAINER_SET_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CONTAINER_SET_DATA_PACKET; + return ProtocolInfo8::CONTAINER_SET_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CONTAINER_SET_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/ContainerSetSlotPacket.php b/src/network/protocol/packet/ContainerSetSlotPacket.php index f6e8d18d..7a5d8ef6 100644 --- a/src/network/protocol/packet/ContainerSetSlotPacket.php +++ b/src/network/protocol/packet/ContainerSetSlotPacket.php @@ -8,12 +8,12 @@ class ContainerSetSlotPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::CONTAINER_SET_SLOT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::CONTAINER_SET_SLOT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::CONTAINER_SET_SLOT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::CONTAINER_SET_SLOT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::CONTAINER_SET_SLOT_PACKET; + return ProtocolInfo8::CONTAINER_SET_SLOT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::CONTAINER_SET_SLOT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/DropItemPacket.php b/src/network/protocol/packet/DropItemPacket.php index 0217d602..364afd11 100644 --- a/src/network/protocol/packet/DropItemPacket.php +++ b/src/network/protocol/packet/DropItemPacket.php @@ -8,12 +8,12 @@ class DropItemPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::DROP_ITEM_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::DROP_ITEM_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::DROP_ITEM_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::DROP_ITEM_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::DROP_ITEM_PACKET; + return ProtocolInfo8::DROP_ITEM_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::DROP_ITEM_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/EntityDataPacket.php b/src/network/protocol/packet/EntityDataPacket.php index 87512adb..b78c7358 100644 --- a/src/network/protocol/packet/EntityDataPacket.php +++ b/src/network/protocol/packet/EntityDataPacket.php @@ -8,7 +8,7 @@ class EntityDataPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::ENTITY_DATA_PACKET; + return ProtocolInfo8::ENTITY_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::ENTITY_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/EntityEventPacket.php b/src/network/protocol/packet/EntityEventPacket.php index 78daf662..4ddb4d8c 100644 --- a/src/network/protocol/packet/EntityEventPacket.php +++ b/src/network/protocol/packet/EntityEventPacket.php @@ -16,10 +16,10 @@ class EntityEventPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::ENTITY_EVENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::ENTITY_EVENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::ENTITY_EVENT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::ENTITY_EVENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::ENTITY_EVENT_PACKET; } diff --git a/src/network/protocol/packet/ExplodePacket.php b/src/network/protocol/packet/ExplodePacket.php index c0bfae10..5d0930f8 100644 --- a/src/network/protocol/packet/ExplodePacket.php +++ b/src/network/protocol/packet/ExplodePacket.php @@ -8,10 +8,10 @@ class ExplodePacket extends RakNetDataPacket{ public $records; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::EXPLODE_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::EXPLODE_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::EXPLODE_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::EXPLODE_PACKET; } diff --git a/src/network/protocol/packet/InteractPacket.php b/src/network/protocol/packet/InteractPacket.php index 844edc7c..3f07246e 100644 --- a/src/network/protocol/packet/InteractPacket.php +++ b/src/network/protocol/packet/InteractPacket.php @@ -11,12 +11,12 @@ class InteractPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::INTERACT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::INTERACT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::INTERACT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::INTERACT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::INTERACT_PACKET; + return ProtocolInfo8::INTERACT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::INTERACT_PACKET; } diff --git a/src/network/protocol/packet/LevelEventPacket.php b/src/network/protocol/packet/LevelEventPacket.php index 94d5b4cc..4dba836b 100644 --- a/src/network/protocol/packet/LevelEventPacket.php +++ b/src/network/protocol/packet/LevelEventPacket.php @@ -12,10 +12,10 @@ class LevelEventPacket extends RakNetDataPacket{ public $data; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::LEVEL_EVENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::LEVEL_EVENT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::LEVEL_EVENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::LEVEL_EVENT_PACKET; } diff --git a/src/network/protocol/packet/MoveEntityPacket.php b/src/network/protocol/packet/MoveEntityPacket.php index 1272ea68..18032c02 100644 --- a/src/network/protocol/packet/MoveEntityPacket.php +++ b/src/network/protocol/packet/MoveEntityPacket.php @@ -3,7 +3,7 @@ class MoveEntityPacket extends RakNetDataPacket{ public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::MOVE_ENTITY_PACKET; } return ProtocolInfo::MOVE_ENTITY_PACKET; diff --git a/src/network/protocol/packet/MoveEntityPacket_PosRot.php b/src/network/protocol/packet/MoveEntityPacket_PosRot.php index 6d4ff310..5ec9632d 100644 --- a/src/network/protocol/packet/MoveEntityPacket_PosRot.php +++ b/src/network/protocol/packet/MoveEntityPacket_PosRot.php @@ -9,7 +9,7 @@ class MoveEntityPacket_PosRot extends RakNetDataPacket{ public $pitch; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::MOVE_ENTITY_PACKET_POSROT; } return ProtocolInfo::MOVE_ENTITY_PACKET_POSROT; diff --git a/src/network/protocol/packet/MovePlayerPacket.php b/src/network/protocol/packet/MovePlayerPacket.php index 05153c50..276ae2e0 100644 --- a/src/network/protocol/packet/MovePlayerPacket.php +++ b/src/network/protocol/packet/MovePlayerPacket.php @@ -10,7 +10,7 @@ class MovePlayerPacket extends RakNetDataPacket{ public $bodyYaw; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::MOVE_PLAYER_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::MOVE_PLAYER_PACKET; diff --git a/src/network/protocol/packet/PlaceBlockPacket.php b/src/network/protocol/packet/PlaceBlockPacket.php index f31b749d..743738bd 100644 --- a/src/network/protocol/packet/PlaceBlockPacket.php +++ b/src/network/protocol/packet/PlaceBlockPacket.php @@ -10,7 +10,7 @@ class PlaceBlockPacket extends RakNetDataPacket{ public $face; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::PLACE_BLOCK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL) { return ProtocolInfo12::PLACE_BLOCK_PACKET; diff --git a/src/network/protocol/packet/PlayerActionPacket.php b/src/network/protocol/packet/PlayerActionPacket.php index edc7ee4b..9e423e71 100644 --- a/src/network/protocol/packet/PlayerActionPacket.php +++ b/src/network/protocol/packet/PlayerActionPacket.php @@ -9,10 +9,10 @@ class PlayerActionPacket extends RakNetDataPacket{ public $eid; public function pid(){ - if($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::PLAYER_ACTION_PACKET; + if($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::PLAYER_ACTION_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::PLAYER_ACTION_PACKET; + return ProtocolInfo8::PLAYER_ACTION_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::PLAYER_ACTION_PACKET; } diff --git a/src/network/protocol/packet/PlayerEquipmentPacket.php b/src/network/protocol/packet/PlayerEquipmentPacket.php index d313f7ce..c7806eb5 100644 --- a/src/network/protocol/packet/PlayerEquipmentPacket.php +++ b/src/network/protocol/packet/PlayerEquipmentPacket.php @@ -9,10 +9,10 @@ class PlayerEquipmentPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::PLAYER_EQUIPMENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::PLAYER_EQUIPMENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::PLAYER_EQUIPMENT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::PLAYER_EQUIPMENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::PLAYER_EQUIPMENT_PACKET; } diff --git a/src/network/protocol/packet/RemoveBlockPacket.php b/src/network/protocol/packet/RemoveBlockPacket.php index 1964cf4b..f7ba3de5 100644 --- a/src/network/protocol/packet/RemoveBlockPacket.php +++ b/src/network/protocol/packet/RemoveBlockPacket.php @@ -7,7 +7,7 @@ class RemoveBlockPacket extends RakNetDataPacket{ public $z; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::REMOVE_BLOCK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::REMOVE_BLOCK_PACKET; diff --git a/src/network/protocol/packet/RemoveEntityPacket.php b/src/network/protocol/packet/RemoveEntityPacket.php index bbf7ea95..c835d9a9 100644 --- a/src/network/protocol/packet/RemoveEntityPacket.php +++ b/src/network/protocol/packet/RemoveEntityPacket.php @@ -4,7 +4,7 @@ class RemoveEntityPacket extends RakNetDataPacket{ public $eid; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::REMOVE_ENTITY_PACKET; } return ProtocolInfo::REMOVE_ENTITY_PACKET; diff --git a/src/network/protocol/packet/RequestChunkPacket.php b/src/network/protocol/packet/RequestChunkPacket.php index 70c5e050..33c1ecc2 100644 --- a/src/network/protocol/packet/RequestChunkPacket.php +++ b/src/network/protocol/packet/RequestChunkPacket.php @@ -7,10 +7,10 @@ class RequestChunkPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::REQUEST_CHUNK_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::REQUEST_CHUNK_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::REQUEST_CHUNK_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::REQUEST_CHUNK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::REQUEST_CHUNK_PACKET; } diff --git a/src/network/protocol/packet/RespawnPacket.php b/src/network/protocol/packet/RespawnPacket.php index 544193bc..c88a856a 100644 --- a/src/network/protocol/packet/RespawnPacket.php +++ b/src/network/protocol/packet/RespawnPacket.php @@ -9,12 +9,12 @@ class RespawnPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::RESPAWN_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::RESPAWN_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::RESPAWN_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::RESPAWN_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::RESPAWN_PACKET; + return ProtocolInfo8::RESPAWN_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::RESPAWN_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/SendInventoryPacket.php b/src/network/protocol/packet/SendInventoryPacket.php index c762c7ee..e1e2ef0a 100644 --- a/src/network/protocol/packet/SendInventoryPacket.php +++ b/src/network/protocol/packet/SendInventoryPacket.php @@ -9,12 +9,12 @@ class SendInventoryPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::SEND_INVENTORY_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::SEND_INVENTORY_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::SEND_INVENTORY_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::SEND_INVENTORY_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::SEND_INVENTORY_PACKET; + return ProtocolInfo8::SEND_INVENTORY_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::SEND_INVENTORY_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/SetEntityDataPacket.php b/src/network/protocol/packet/SetEntityDataPacket.php index cb1c80d4..eac162d3 100644 --- a/src/network/protocol/packet/SetEntityDataPacket.php +++ b/src/network/protocol/packet/SetEntityDataPacket.php @@ -7,12 +7,12 @@ class SetEntityDataPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::SET_ENTITY_DATA_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::SET_ENTITY_DATA_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::SET_ENTITY_DATA_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::SET_ENTITY_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::SET_ENTITY_DATA_PACKET; + return ProtocolInfo8::SET_ENTITY_DATA_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::SET_ENTITY_DATA_PACKET; } @@ -25,7 +25,7 @@ class SetEntityDataPacket extends RakNetDataPacket{ public function encode(){ $this->reset(); - if($this->PROTOCOL >= ProtocolInfo7::CURRENT_PROTOCOL_7) + if($this->PROTOCOL >= ProtocolInfo8::CURRENT_PROTOCOL_8) $this->putInt($this->eid); $this->put(Utils::writeMetadata($this->metadata)); } diff --git a/src/network/protocol/packet/SetEntityMotionPacket.php b/src/network/protocol/packet/SetEntityMotionPacket.php index 1b58c07f..5bd44bf6 100644 --- a/src/network/protocol/packet/SetEntityMotionPacket.php +++ b/src/network/protocol/packet/SetEntityMotionPacket.php @@ -7,12 +7,12 @@ class SetEntityMotionPacket extends RakNetDataPacket{ public $speedZ; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::SET_ENTITY_MOTION_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::SET_ENTITY_MOTION_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::SET_ENTITY_MOTION_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::SET_ENTITY_MOTION_PACKET; + return ProtocolInfo8::SET_ENTITY_MOTION_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::SET_ENTITY_MOTION_PACKET; } diff --git a/src/network/protocol/packet/SetHealthPacket.php b/src/network/protocol/packet/SetHealthPacket.php index 02f36425..0ef18bdb 100644 --- a/src/network/protocol/packet/SetHealthPacket.php +++ b/src/network/protocol/packet/SetHealthPacket.php @@ -6,12 +6,12 @@ class SetHealthPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::SET_HEALTH_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::SET_HEALTH_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::SET_HEALTH_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::SET_HEALTH_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::SET_HEALTH_PACKET; + return ProtocolInfo8::SET_HEALTH_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::SET_HEALTH_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/SetSpawnPositionPacket.php b/src/network/protocol/packet/SetSpawnPositionPacket.php index ae9c7571..a072a131 100644 --- a/src/network/protocol/packet/SetSpawnPositionPacket.php +++ b/src/network/protocol/packet/SetSpawnPositionPacket.php @@ -7,7 +7,7 @@ class SetSpawnPositionPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::SET_SPAWN_POSITION_PACKET; + return ProtocolInfo8::SET_SPAWN_POSITION_PACKET; }elseif($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ return ProtocolInfo9::SET_SPAWN_POSITION_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ diff --git a/src/network/protocol/packet/TakeItemEntityPacket.php b/src/network/protocol/packet/TakeItemEntityPacket.php index 314674eb..5c3e9eae 100644 --- a/src/network/protocol/packet/TakeItemEntityPacket.php +++ b/src/network/protocol/packet/TakeItemEntityPacket.php @@ -5,7 +5,7 @@ class TakeItemEntityPacket extends RakNetDataPacket{ public $eid; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::TAKE_ITEM_ENTITY_PACKET; } return ProtocolInfo::TAKE_ITEM_ENTITY_PACKET; diff --git a/src/network/protocol/packet/TileEventPacket.php b/src/network/protocol/packet/TileEventPacket.php index af225590..ef33178b 100644 --- a/src/network/protocol/packet/TileEventPacket.php +++ b/src/network/protocol/packet/TileEventPacket.php @@ -8,10 +8,10 @@ class TileEventPacket extends RakNetDataPacket{ public $case2; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::TILE_EVENT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::TILE_EVENT_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::TILE_EVENT_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::TILE_EVENT_PACKET; } diff --git a/src/network/protocol/packet/UpdateBlockPacket.php b/src/network/protocol/packet/UpdateBlockPacket.php index 271ba18d..d1e85f11 100644 --- a/src/network/protocol/packet/UpdateBlockPacket.php +++ b/src/network/protocol/packet/UpdateBlockPacket.php @@ -8,7 +8,7 @@ class UpdateBlockPacket extends RakNetDataPacket{ public $meta; public function pid(){ - if($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + if($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::UPDATE_BLOCK_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::UPDATE_BLOCK_PACKET; diff --git a/src/network/protocol/packet/UseItemPacket.php b/src/network/protocol/packet/UseItemPacket.php index 379cd58f..593df77d 100644 --- a/src/network/protocol/packet/UseItemPacket.php +++ b/src/network/protocol/packet/UseItemPacket.php @@ -18,12 +18,12 @@ class UseItemPacket extends RakNetDataPacket{ public function pid(){ if($this->PROTOCOL < ProtocolInfo4::CURRENT_PROTOCOL_4){ return ProtocolInfo3::USE_ITEM_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo5::CURRENT_PROTOCOL_5){ + }elseif($this->PROTOCOL < ProtocolInfo6::CURRENT_PROTOCOL_6){ return ProtocolInfo4::USE_ITEM_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo7::CURRENT_PROTOCOL_7){ - return ProtocolInfo5::USE_ITEM_PACKET; + }elseif($this->PROTOCOL < ProtocolInfo8::CURRENT_PROTOCOL_8){ + return ProtocolInfo6::USE_ITEM_PACKET; }elseif($this->PROTOCOL < ProtocolInfo9::CURRENT_PROTOCOL_9){ - return ProtocolInfo7::USE_ITEM_PACKET; + return ProtocolInfo8::USE_ITEM_PACKET; }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::USE_ITEM_PACKET; }