diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php index 905a4ed3..d0c7c600 100644 --- a/src/API/PlayerAPI.php +++ b/src/API/PlayerAPI.php @@ -527,7 +527,6 @@ class PlayerAPI{ */ public static function decodeProtocol($ip, $port){ foreach(ServerAPI::request()->clients as $p) { - ConsoleAPI::info($p->ip); if($p->ip == $ip && $p->port == $port){ return $p->PROTOCOL; } diff --git a/src/Player.php b/src/Player.php index 9e9aec99..48543d65 100755 --- a/src/Player.php +++ b/src/Player.php @@ -676,7 +676,8 @@ class Player{ public function sendBigPacketAlwaysRecover(RakNetDataPacket $pk){ if($this->connected === false) return false; if(EventHandler::callEvent(new DataPacketSendEvent($this, $pk)) === BaseEvent::DENY) return; - + + $pk->PROTOCOL = $this->PROTOCOL; $pk->encode(); $sendtime = microtime(true); $size = $this->MTU - 34; @@ -1105,6 +1106,9 @@ class Player{ public function eventHandler($data, $event){ switch($event){ case "entity.link": + if($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ + break; + } $pk = new SetEntityLinkPacket(); $pk->rider = $data["rider"]; $pk->riding = $data["riding"]; @@ -1797,6 +1801,7 @@ class Player{ if(EventHandler::callEvent(new DataPacketSendEvent($this, $pk)) === BaseEvent::DENY) return; if(!$this->convertToLocalEIDPacket($pk)) return false; + $pk->PROTOCOL = $this->PROTOCOL; $pk->encode(); $len = 1 + strlen($pk->buffer); @@ -1842,7 +1847,6 @@ class Player{ if(!$this->convertToLocalEIDPacket($pk)) return false; $pk->PROTOCOL = $this->PROTOCOL; $pk->encode(); - $len = 1 + strlen($pk->buffer); $MTU = $this->MTU - 24; if($len > $MTU) return $this->entityQueueDataPacket_big($pk); @@ -2097,6 +2101,7 @@ class Player{ if(EventHandler::callEvent(new DataPacketSendEvent($this, $packet)) === BaseEvent::DENY) return false; if(!$this->convertToLocalEIDPacket($packet)) return false; + $packet->PROTOCOL = $this->PROTOCOL; $packet->encode(); $len = strlen($packet->buffer) + 1; $MTU = $this->MTU - 24; diff --git a/src/network/PacketPool.php b/src/network/PacketPool.php index 3571c697..64158e1c 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, [8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(EntityDataPacket::class, [12, 13, 14]); self::registerPacket(EntityEventPacket::class); self::registerPacket(ExplodePacket::class); @@ -91,7 +91,7 @@ class PacketPool{ self::registerPacket(PlayerActionPacket::class, [6, 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, [8, 9, 10, 11, 12, 13, 14]); + self::registerPacket(PlayerInputPacket::class, [12, 13, 14]); self::registerPacket(PongPacket::class); self::registerPacket(ReadyPacket::class); diff --git a/src/network/protocol/ProtocolInfo.php b/src/network/protocol/ProtocolInfo.php index 1418d913..06e6b0ad 100644 --- a/src/network/protocol/ProtocolInfo.php +++ b/src/network/protocol/ProtocolInfo.php @@ -212,8 +212,6 @@ abstract class ProtocolInfo9{ const CHAT_PACKET = 0xb4; const SIGN_UPDATE_PACKET = 0xb5; const ADVENTURE_SETTINGS_PACKET = 0xb6; - const ENTITY_DATA_PACKET = 0xb7; - const PLAYER_INPUT_PACKET = 0xb9; } abstract class ProtocolInfo8{ @@ -281,8 +279,6 @@ abstract class ProtocolInfo8{ const CHAT_PACKET = 0xb1; const SIGN_UPDATE_PACKET = 0xb2; const ADVENTURE_SETTINGS_PACKET = 0xb3; - const ENTITY_DATA_PACKET = 0xb2; - const PLAYER_INPUT_PACKET = 0xb9; } abstract class ProtocolInfo6{ @@ -349,8 +345,6 @@ abstract class ProtocolInfo6{ const CHAT_PACKET = 0xaf; const SIGN_UPDATE_PACKET = 0xb0; //const ADVENTURE_SETTINGS_PACKET = 0xb3; - //const ENTITY_DATA_PACKET = 0xb2; - //const PLAYER_INPUT_PACKET = 0xb9; } abstract class ProtocolInfo4{ @@ -416,8 +410,6 @@ abstract class ProtocolInfo4{ const CONTAINER_ACK_PACKET = 0xac; //const CHAT_PACKET = 0xaf; //const ADVENTURE_SETTINGS_PACKET = 0xb3; - //const ENTITY_DATA_PACKET = 0xb2; - //const PLAYER_INPUT_PACKET = 0xb9; } abstract class ProtocolInfo3{ @@ -483,8 +475,6 @@ abstract class ProtocolInfo3{ const CONTAINER_ACK_PACKET = 0xac; //const CHAT_PACKET = 0xaf; //const ADVENTURE_SETTINGS_PACKET = 0xb3; - //const ENTITY_DATA_PACKET = 0xb2; - //const PLAYER_INPUT_PACKET = 0xb9; } /***REM_START***/ require_once(FILE_PATH . "src/network/raknet/RakNetDataPacket.php"); diff --git a/src/network/protocol/packet/EntityDataPacket.php b/src/network/protocol/packet/EntityDataPacket.php index b78c7358..0878b958 100644 --- a/src/network/protocol/packet/EntityDataPacket.php +++ b/src/network/protocol/packet/EntityDataPacket.php @@ -7,11 +7,7 @@ class EntityDataPacket extends RakNetDataPacket{ public $namedtag; public function pid(){ - if($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){ + if($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::ENTITY_DATA_PACKET; } return ProtocolInfo::ENTITY_DATA_PACKET; diff --git a/src/network/protocol/packet/PlayerInputPacket.php b/src/network/protocol/packet/PlayerInputPacket.php index 618dba70..55e20203 100644 --- a/src/network/protocol/packet/PlayerInputPacket.php +++ b/src/network/protocol/packet/PlayerInputPacket.php @@ -8,9 +8,7 @@ class PlayerInputPacket extends RakNetDataPacket{ } public function pid(){ - if($this->PROTOCOL < ProtocolInfo12::CURRENT_PROTOCOL_12){ - return ProtocolInfo9::PLAYER_INPUT_PACKET; - }elseif($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ + if($this->PROTOCOL < ProtocolInfo::CURRENT_PROTOCOL){ return ProtocolInfo12::PLAYER_INPUT_PACKET; } return ProtocolInfo::PLAYER_INPUT_PACKET;