From 2e0d49a2ba95bf9e37b6d3b7b04cc356fcb7b756 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Thu, 21 Mar 2013 17:03:13 +0100 Subject: [PATCH] Moved the RAKNET_MAGIC constant --- src/Player.php | 2 +- src/PocketMinecraftServer.php | 10 +++++----- src/config.php | 1 - src/constants/ProtocolInfo.php | 1 + src/network/Packet.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Player.php b/src/Player.php index 70ab0317..4d5ef956 100644 --- a/src/Player.php +++ b/src/Player.php @@ -562,7 +562,7 @@ class Player{ break; } $this->send(0x08, array( - MAGIC, + RAKNET_MAGIC, $this->server->serverID, $this->port, $data[3], diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index ef01769c..7bfe73f4 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -529,7 +529,7 @@ class PocketMinecraftServer{ $this->send(0x1c, array( $data[0], $this->serverID, - MAGIC, + RAKNET_MAGIC, $this->serverType, ), false, $packet["ip"], $packet["port"]); break; @@ -538,7 +538,7 @@ class PocketMinecraftServer{ $this->send(0x1c, array( $data[0], $this->serverID, - MAGIC, + RAKNET_MAGIC, $this->serverType. $this->name . " [You're banned]", ), false, $packet["ip"], $packet["port"]); break; @@ -555,7 +555,7 @@ class PocketMinecraftServer{ $this->send(0x1c, array( $data[0], $this->serverID, - MAGIC, + RAKNET_MAGIC, $this->serverType. $this->name . " [".($this->gamemode === CREATIVE ? "C":($this->gamemode === ADVENTURE ? "A":"S")).($this->whitelist !== false ? "W":"")." ".count($this->clients)."/".$this->maxClients."] ".$txt, ), false, $packet["ip"], $packet["port"]); $this->custom["times_".$CID] = ($this->custom["times_".$CID] + 1) % strlen($this->description); @@ -585,12 +585,12 @@ class PocketMinecraftServer{ console("[DEBUG] Incorrect structure #$version from ".$packet["ip"].":".$packet["port"], true, true, 2); $this->send(0x1a, array( CURRENT_STRUCTURE, - MAGIC, + RAKNET_MAGIC, $this->serverID, ), false, $packet["ip"], $packet["port"]); }else{ $this->send(0x06, array( - MAGIC, + RAKNET_MAGIC, $this->serverID, 0, strlen($packet["raw"]), diff --git a/src/config.php b/src/config.php index 1b1dcf3f..bffaa49e 100644 --- a/src/config.php +++ b/src/config.php @@ -41,7 +41,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH); ini_set("memory_limit", "256M"); //Default define("LOG", true); -define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); define("TEST_MD5", "ffe889db5932db1e3371d48773590e59"); define("MAJOR_VERSION", "Alpha_1.3dev"); define("CURRENT_STRUCTURE", 5); diff --git a/src/constants/ProtocolInfo.php b/src/constants/ProtocolInfo.php index 12aa10e0..a0321cb4 100644 --- a/src/constants/ProtocolInfo.php +++ b/src/constants/ProtocolInfo.php @@ -25,6 +25,7 @@ the Free Software Foundation, either version 3 of the License, or */ +define("RAKNET_MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78"); define("MC_KEEP_ALIVE", 0x00); diff --git a/src/network/Packet.php b/src/network/Packet.php index 764a70e9..dcbada2f 100644 --- a/src/network/Packet.php +++ b/src/network/Packet.php @@ -93,7 +93,7 @@ class Packet{ } break; case "magic": - $this->addRaw(MAGIC); + $this->addRaw(RAKNET_MAGIC); break; case "float": $this->addRaw(Utils::writeFloat($this->data[$field]));