mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.0

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-12-19 18:38:13 +00:00
parent 2930cf80b4 a122ea9e75
commit d9eb767420
14 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/PocketMine.php
View File

@ -65,6 +65,7 @@ namespace {
}
namespace pocketmine {
use pocketmine\network\protocol\Info as ProtocolInfo;
use pocketmine\utils\Binary;
use pocketmine\utils\MainLogger;
use pocketmine\utils\ServerKiller;
@ -76,8 +77,6 @@ namespace pocketmine {
const VERSION = "1.6.2dev";
const API_VERSION = "2.2.0";
const CODENAME = "Unleashed";
const MINECRAFT_VERSION = "v1.0.0.2";
const MINECRAFT_VERSION_NETWORK = "1.0.0.2";
/*
* Startup code. Do not look at it, it may harm you.
@ -146,6 +145,16 @@ namespace pocketmine {
define('pocketmine\DATA', isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
define('pocketmine\PLUGIN_PATH', isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
/**
* @deprecated This constant has moved to {@link \pocketmine\network\protocol\Info} and will be removed from here in the future.
*/
const MINECRAFT_VERSION = ProtocolInfo::MINECRAFT_VERSION;
/**
* @deprecated This constant has moved to {@link \pocketmine\network\protocol\Info} and will be removed from here in the future.
*/
const MINECRAFT_VERSION_NETWORK = ProtocolInfo::MINECRAFT_VERSION_NETWORK;
Terminal::init();
define('pocketmine\ANSI', Terminal::hasFormattingCodes());