diff --git a/src/PocketMine/PocketMine.php b/src/PocketMine/PocketMine.php index 2408fb5fd..605e0ec79 100644 --- a/src/PocketMine/PocketMine.php +++ b/src/PocketMine/PocketMine.php @@ -116,7 +116,7 @@ namespace PocketMine { $opts = getopt("", array("enable-ansi", "disable-ansi", "data-path:", "no-wizard")); define("PocketMine\\DATA", isset($opts["data-path"]) ? realpath($opts["data-path"]) . DIRECTORY_SEPARATOR : \PocketMine\PATH); - if((!strpos(strtoupper(php_uname("s")), "WIN") or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"])){ + if((strpos(strtoupper(php_uname("s")), "WIN") === false or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"])){ define("PocketMine\\ANSI", true); } else{ define("PocketMine\\ANSI", false); diff --git a/src/PocketMine/Server.php b/src/PocketMine/Server.php index 21ef69cce..4c079a558 100644 --- a/src/PocketMine/Server.php +++ b/src/PocketMine/Server.php @@ -107,14 +107,14 @@ class Server{ public function titleTick(){ $time = microtime(true); - if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and ANSI === true){ + if(defined("PocketMine\\DEBUG") and \PocketMine\DEBUG >= 0 and \PocketMine\ANSI === true){ echo "\x1b]0;PocketMine-MP " . VERSION . " | Online " . count(Player::$list) . "/" . $this->maxClients . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "MB | U " . round(($this->interface->bandwidth[1] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2) . " D " . round(($this->interface->bandwidth[0] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2) . " kB/s | TPS " . $this->getTPS() . "\x07"; } $this->interface->bandwidth = array(0, 0, $time); } public function loadEvents(){ - if(ANSI === true){ + if(\PocketMine\ANSI === true){ $this->schedule(30, array($this, "titleTick"), array(), true); } $this->schedule(20 * 15, array($this, "checkTicks"), array(), true);