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

Removed deprecated chat() method in server

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-07 13:47:11 +02:00
parent 1d32e82265
commit 539c8046d8
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/PocketMinecraftServer.php
View File

@ -28,7 +28,7 @@ the Free Software Foundation, either version 3 of the License, or
class PocketMinecraftServer{ class PocketMinecraftServer{
public $tCnt; public $tCnt;
public $version, $invisible, $api, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $timePerSecond, $spawn, $entities, $mapDir, $mapName, $map, $levelData, $tileEntities; public $version, $invisible, $api, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $timePerSecond, $spawn, $entities, $mapDir, $mapName, $map, $levelData, $tileEntities;
private $serverip, $database, $interface, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $ticker; private $serverip, $database, $interface, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick;
private function load(){ private function load(){
$this->version = new VersionString(); $this->version = new VersionString();
@ -46,7 +46,6 @@ class PocketMinecraftServer{
$this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)):$this->seed; $this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)):$this->seed;
console("[INFO] Loading database..."); console("[INFO] Loading database...");
$this->startDatabase(); $this->startDatabase();
$this->doTick = false;
$this->api = false; $this->api = false;
$this->tCnt = 1; $this->tCnt = 1;
$this->mapDir = false; $this->mapDir = false;
@ -84,6 +83,7 @@ class PocketMinecraftServer{
function __construct($name, $gamemode = CREATIVE, $seed = false, $port = 19132, $serverID = false, $serverip = "0.0.0.0"){ function __construct($name, $gamemode = CREATIVE, $seed = false, $port = 19132, $serverID = false, $serverip = "0.0.0.0"){
$this->port = (int) $port; //19132 - 19135 $this->port = (int) $port; //19132 - 19135
$this->doTick = true;
$this->gamemode = (int) $gamemode; $this->gamemode = (int) $gamemode;
$this->name = $name; $this->name = $name;
$this->motd = "Welcome to ".$name; $this->motd = "Welcome to ".$name;
@ -175,10 +175,9 @@ class PocketMinecraftServer{
} }
if(($this->api instanceof ServerAPI) === true){ if(($this->api instanceof ServerAPI) === true){
if(($this->api->chat instanceof ChatAPI) === true){ if(($this->api->chat instanceof ChatAPI) === true){
$this->api->chat->send(false, "Stopping server..."); $this->api->chat->broadcast("Stopping server...");
} }
} }
//$this->ticker->stop = true;
$this->save(true); $this->save(true);
$this->stop = true; $this->stop = true;
$this->trigger("server.close", $reason); $this->trigger("server.close", $reason);
@ -186,10 +185,6 @@ class PocketMinecraftServer{
} }
} }
public function chat($owner, $text, $target = false){
$this->api->chat->send($owner, $text, $target);
}
public function setType($type = "normal"){ public function setType($type = "normal"){
switch($type){ switch($type){
case "normal": case "normal":
@ -446,8 +441,6 @@ class PocketMinecraftServer{
} }
console("[INFO] Loading events..."); console("[INFO] Loading events...");
$this->loadEvents(); $this->loadEvents();
//$this->ticker = new TickLoop($this);
//$this->ticker->start();
declare(ticks=40); declare(ticks=40);
register_tick_function(array($this, "tick")); register_tick_function(array($this, "tick"));
register_shutdown_function(array($this, "dumpError")); register_shutdown_function(array($this, "dumpError"));
@ -496,15 +489,6 @@ class PocketMinecraftServer{
} }
public function tick(){ public function tick(){
/*if($this->ticker->tick === true and $this->ticker->isWaiting() === true){
$this->ticker->tick = false;
$time = microtime(true);
array_shift($this->tickMeasure);
$this->tickMeasure[] = $this->lastTick = $time;
$this->tickerFunction($time);
$this->trigger("server.tick", $time);
$this->ticker->notify();
}*/
$time = microtime(true); $time = microtime(true);
if($this->lastTick <= ($time - 0.05)){ if($this->lastTick <= ($time - 0.05)){
array_shift($this->tickMeasure); array_shift($this->tickMeasure);