mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Removed API::action()

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-05-31 14:29:46 +02:00
parent 732f5f5168
commit 1376cc860d
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/PlayerAPI.php
View File

@ -32,7 +32,7 @@ class PlayerAPI{
} }
public function init(){ public function init(){
$this->server->addHandler("server.regeneration", array($this, "handle")); $this->server->schedule(20 * 15, array($this, "handle"), 1, true, "server.regeneration");
$this->server->addHandler("player.death", array($this, "handle"), 1); $this->server->addHandler("player.death", array($this, "handle"), 1);
$this->server->api->console->register("list", "", array($this, "commandHandler")); $this->server->api->console->register("list", "", array($this, "commandHandler"));
$this->server->api->console->register("kill", "<player>", array($this, "commandHandler")); $this->server->api->console->register("kill", "<player>", array($this, "commandHandler"));

4
src/API/ServerAPI.php
View File

@ -318,10 +318,6 @@ class ServerAPI{
return $this->server->handle($e, $d); return $this->server->handle($e, $d);
} }
public function action($t, $c, $r = true){
return $this->server->action($t, $c, $r);
}
public function schedule($t, $c, $d, $r = false, $e = "server.schedule"){ public function schedule($t, $c, $d, $r = false, $e = "server.schedule"){
return $this->server->schedule($t, $c, $d, $r, $e); return $this->server->schedule($t, $c, $d, $r, $e);
} }

31
src/PocketMinecraftServer.php
View File

@ -100,11 +100,15 @@ class PocketMinecraftServer{
public function loadEvents(){ public function loadEvents(){
if(ENABLE_ANSI === true){ if(ENABLE_ANSI === true){
$this->action(1500000, '$this->titleTick();'); $this->schedule(30, array($this, "titleTick"), array(), true);
}
$this->schedule(20 * 15, array($this, "checkTicks"), array(), true);
}
public function checkTicks(){
if($this->getTPS() < 12){
console("[WARNING] Can\'t keep up! Is the server overloaded?");
} }
$this->action(5000000, 'if($this->difficulty < 2){$this->api->dhandle("server.regeneration", 1);}');
$this->action(1000000 * 15, 'if($this->getTPS() < 15){console("[WARNING] Can\'t keep up! Is the server overloaded?");}');
$this->action(1000000 * 60 * 10, '$this->custom = array();');
} }
public function startDatabase(){ public function startDatabase(){
@ -490,7 +494,7 @@ class PocketMinecraftServer{
} }
} }
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)){ if(!is_callable($callback)){
return false; return false;
} }
@ -500,14 +504,10 @@ class PocketMinecraftServer{
$add = '$this->schedule['.$chcnt.']=null;unset($this->schedule['.$chcnt.']);'; $add = '$this->schedule['.$chcnt.']=null;unset($this->schedule['.$chcnt.']);';
} }
$this->schedule[$chcnt] = array($callback, $data, $eventName); $this->schedule[$chcnt] = array($callback, $data, $eventName);
$this->action(50000 * $ticks, '$schedule=$this->schedule['.$chcnt.'];'.$add.'if(!is_callable($schedule[0])){$this->schedule['.$chcnt.']=null;unset($this->schedule['.$chcnt.']);return false;}return call_user_func($schedule[0],$schedule[1],$schedule[2]);', (bool) $repeat); $this->query("INSERT INTO actions (ID, interval, last, repeat) VALUES(".$chcnt.", ".($ticks / 20).", ".microtime(true).", ".(((bool) $repeat) === true ? 1:0).");");
return $chcnt; return $chcnt;
} }
public function action($microseconds, $code, $repeat = true){
$this->query("INSERT INTO actions (interval, last, code, repeat) VALUES(".($microseconds / 1000000).", ".microtime(true).", '".base64_encode($code)."', ".($repeat === true ? 1:0).");");
}
public function tickerFunction($time){ public function tickerFunction($time){
//actions that repeat every x time will go here //actions that repeat every x time will go here
$this->preparedSQL->selectActions->reset(); $this->preparedSQL->selectActions->reset();
@ -519,9 +519,18 @@ class PocketMinecraftServer{
return; return;
} }
while(($action = $actions->fetchArray(SQLITE3_ASSOC)) !== false){ while(($action = $actions->fetchArray(SQLITE3_ASSOC)) !== false){
$return = eval(base64_decode($action["code"])); $cid = $action["ID"];
$schedule = $this->schedule[$cid];
if(!is_callable($schedule[0])){
$return = false;
}else{
$return = call_user_func($schedule[0],$schedule[1],$schedule[2]);
}
if($action["repeat"] === 0 or $return === false){ if($action["repeat"] === 0 or $return === false){
$this->query("DELETE FROM actions WHERE ID = ".$action["ID"].";"); $this->query("DELETE FROM actions WHERE ID = ".$action["ID"].";");
$this->schedule[$cid] = null;
unset($this->schedule[$cid]);
} }
} }
$actions->finalize(); $actions->finalize();