mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 12:04:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'Core-Rewrite' of github.com:PocketMine/PocketMine-MP into Core-Rewrite

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-06-04 17:08:28 +02:00
parent 905d572d42 e4cdfdf6e9
commit cce9499a61
4 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketmine/PocketMine.php
View File

@@ -315,31 +315,12 @@ namespace pocketmine {
$logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production.");
}
include_once("../RakLib/raklib/RakLib.php");
\raklib\RakLib::bootstrap($autoloader);
$server = new \raklib\server\RakLibServer($logger, $autoloader, 19132, "192.168.1.1");
$socket = $server->getExternalSocket();
while(true){
if(($len = @socket_read($socket, 4)) !== ""){
$packet = socket_read($socket, Binary::readInt($len));
$id = ord($packet{0});
if($id === \raklib\RakLib::PACKET_ENCAPSULATED){
$len = ord($packet{1});
$identifier = substr($packet, 2, $len);
$buffer = substr($packet, 2 + $len);
$pk = \raklib\protocol\EncapsulatedPacket::fromBinary($buffer);
var_dump($pk);
}
}
usleep(1000);
}
/*$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
$server->start();
$logger->shutdown();
$logger->join();
kill(getmypid());
exit(0);*/
exit(0);
}

7
src/pocketmine/Server.php
View File

@@ -84,7 +84,6 @@ use pocketmine\tile\Sign;
use pocketmine\tile\Tile;
use pocketmine\utils\Binary;
use pocketmine\utils\Config;
use pocketmine\utils\Logger;
use pocketmine\utils\MainLogger;
use pocketmine\utils\TextFormat;
use pocketmine\utils\Utils;
@@ -124,7 +123,7 @@ class Server{
/** @var TickScheduler */
private $tickScheduler = null;
/** @var \pocketmine\utils\Logger */
/** @var \Logger */
private $logger;
/** @var CommandReader */
@@ -1187,12 +1186,12 @@ class Server{
/**
* @param \SplClassLoader $autoloader
* @param Logger $logger
* @param \Logger $logger
* @param string $filePath
* @param string $dataPath
* @param string $pluginPath
*/
public function __construct(\SplClassLoader $autoloader, Logger $logger, $filePath, $dataPath, $pluginPath){
public function __construct(\SplClassLoader $autoloader, \Logger $logger, $filePath, $dataPath, $pluginPath){
self::$instance = $this;
$this->autoloader = $autoloader;