mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-11 04:17:48 +00:00
Code Issues Projects Releases Wiki Activity

Double stop fix

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2012-12-26 14:02:20 +01:00
parent d90f317590
commit 39d5fea0ef
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
classes/PocketMinecraftServer.class.php
View File

@ -153,11 +153,13 @@ class PocketMinecraftServer extends stdClass{
} }
public function close($reason = "stop"){ public function close($reason = "stop"){
$this->chat(false, "Stopping server..."); if($this->stop !== true){
$this->save(); $this->chat(false, "Stopping server...");
$this->stop = true; $this->save();
$this->trigger("server.close"); $this->stop = true;
$this->interface->close(); $this->trigger("server.close");
$this->interface->close();
}
} }
public function chat($owner, $text, $target = true){ public function chat($owner, $text, $target = true){
@ -182,9 +184,6 @@ class PocketMinecraftServer extends stdClass{
} }
public function addHandler($event, callable $callable, $priority = 5){ public function addHandler($event, callable $callable, $priority = 5){
if(!is_callable($callable)){
return false;
}
$priority = (int) $priority; $priority = (int) $priority;
$this->handlers[$this->handCnt] = $callable; $this->handlers[$this->handCnt] = $callable;
$this->query("INSERT INTO handlers (ID, name, priority) VALUES (".$this->handCnt.", '".str_replace("'", "\\'", $event)."', ".$priority.");"); $this->query("INSERT INTO handlers (ID, name, priority) VALUES (".$this->handCnt.", '".str_replace("'", "\\'", $event)."', ".$priority.");");
@ -311,7 +310,7 @@ class PocketMinecraftServer extends stdClass{
declare(ticks=15); declare(ticks=15);
register_tick_function(array($this, "tick")); register_tick_function(array($this, "tick"));
register_shutdown_function(array($this, "close")); register_shutdown_function(array($this, "close"));
$this->trigger("server.start"); $this->trigger("server.start", microtime(true));
console("[INFO] Server started!"); console("[INFO] Server started!");
$this->process(); $this->process();
} }
@ -476,9 +475,6 @@ class PocketMinecraftServer extends stdClass{
} }
public function schedule($ticks, callable $callback, $data = array(), $repeat = false, $eventName = "server.schedule"){ public function schedule($ticks, callable $callback, $data = array(), $repeat = false, $eventName = "server.schedule"){
if(!is_callable($callback)){
return false;
}
$add = ""; $add = "";
if($repeat === false){ if($repeat === false){
$add = ' unset($this->schedule['.$this->scheduleCnt.']);'; $add = ' unset($this->schedule['.$this->scheduleCnt.']);';
@ -516,10 +512,7 @@ class PocketMinecraftServer extends stdClass{
$this->preparedSQL->updateActions->execute(); $this->preparedSQL->updateActions->execute();
} }
public function event($event,callable $func){ public function event($event, callable $func){
if(!is_callable($func)){
return false;
}
$this->events[$this->evCnt] = $func; $this->events[$this->evCnt] = $func;
$this->query("INSERT INTO events (ID, name) VALUES (".$this->evCnt.", '".str_replace("'", "\\'", $event)."');"); $this->query("INSERT INTO events (ID, name) VALUES (".$this->evCnt.", '".str_replace("'", "\\'", $event)."');");
console("[INTERNAL] Attached ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)." to event ".$event." (ID ".$this->evCnt.")", true, true, 3); console("[INTERNAL] Attached ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)." to event ".$event." (ID ".$this->evCnt.")", true, true, 3);