mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
Basic Compatiable && Code Clean
This commit is contained in:
parent
d5a3a415b3
commit
153acc4002
6 changed files with 11 additions and 23 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue