mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 23:29:54 +00:00
Code Issues Projects Releases Wiki Activity

Changed property names for consistency (migration included)

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-09 17:35:37 +02:00
parent f093286fb2
commit 7e37a60a67
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/API/ServerAPI.php
View File

@ -94,9 +94,9 @@ class ServerAPI{
"server-name" => "Minecraft Server", "server-name" => "Minecraft Server",
"description" => "Server made using PocketMine-MP", "description" => "Server made using PocketMine-MP",
"motd" => "Welcome @username to this server!", "motd" => "Welcome @username to this server!",
"invisible" => false, "server-invisible" => false,
"server-ip" => "0.0.0.0", "server-ip" => "0.0.0.0",
"port" => 19132, "server-port" => 19132,
"memory-limit" => "256M", "memory-limit" => "256M",
"last-update" => false, "last-update" => false,
"white-list" => false, "white-list" => false,
@ -118,7 +118,12 @@ class ServerAPI{
)); ));
$this->parseProperties(); $this->parseProperties();
define("DEBUG", $this->getProperty("debug")); define("DEBUG", $this->getProperty("debug"));
$this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), false, $this->getProperty("port"), $this->getProperty("server-id"), $this->getProperty("server-ip")); if($this->getProperty("port") !== false){
$this->setProperty("server-port", $this->getProperty("port"));
$this->config->remove("port");
$this->config->remove("invisible");
}
$this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), false, $this->getProperty("server-port"), $this->getProperty("server-id"), $this->getProperty("server-ip"));
self::$serverRequest = $this->server; self::$serverRequest = $this->server;
$this->setProperty("server-id", $this->server->serverID); $this->setProperty("server-id", $this->server->serverID);
$this->server->api = $this; $this->server->api = $this;
@ -130,7 +135,7 @@ class ServerAPI{
if($this->getProperty("upnp-forwarding") === true){ if($this->getProperty("upnp-forwarding") === true){
console("[INFO] [UPnP] Trying to port forward..."); console("[INFO] [UPnP] Trying to port forward...");
UPnP_PortForward($this->getProperty("port")); UPnP_PortForward($this->getProperty("server-port"));
} }
if(($ip = Utils::getIP()) !== false){ if(($ip = Utils::getIP()) !== false){
console("[INFO] External IP: ".$ip); console("[INFO] External IP: ".$ip);
@ -287,8 +292,8 @@ class ServerAPI{
}else{ }else{
$this->setProperty("memory-limit", "256M"); $this->setProperty("memory-limit", "256M");
} }
if(!$this->config->exists("invisible")){ if(!$this->config->exists("server-invisible")){
$this->config->set("invisible", false); $this->config->set("server-invisible", false);
} }
if($this->server instanceof PocketMinecraftServer){ if($this->server instanceof PocketMinecraftServer){
$this->server->setType($this->getProperty("server-type")); $this->server->setType($this->getProperty("server-type"));
@ -346,7 +351,7 @@ class ServerAPI{
$this->__destruct(); $this->__destruct();
if($this->getProperty("upnp-forwarding") === true ){ if($this->getProperty("upnp-forwarding") === true ){
console("[INFO] [UPnP] Removing port forward..."); console("[INFO] [UPnP] Removing port forward...");
UPnP_RemovePortForward($this->getProperty("port")); UPnP_RemovePortForward($this->getProperty("server-port"));
} }
return $this->restart; return $this->restart;
} }