PMF & Multiworld [part 3]

This commit is contained in:
Shoghi Cervantes Pueyo 2013-05-14 20:58:53 +02:00
parent 5938747083
commit 2254e87ce4
10 changed files with 38 additions and 29 deletions

View file

@ -359,7 +359,7 @@ class BlockAPI{
return $this->cancelAction($block, $player);
}
if($hand->isTransparent === false and $player->entity->inBlock($block->x, $block->y, $block->z)){
if($hand->isTransparent === false and $player->entity->inBlock($block)){
return $this->cancelAction($block, $player); //Entity in block
}

View file

@ -30,7 +30,13 @@ class LevelAPI{
public function __construct(){
$this->server = ServerAPI::request();
$this->levels = array();
$this->map = $this->server->level;
}
public function get($name){
if(isset($this->levels[$name])){
return $this->levels[$name];
}
return false;
}
public function getDefault(){
@ -54,6 +60,7 @@ class LevelAPI{
$gen->save($path, $this->default);
$this->loadLevel($this->default);
}
$this->server->spawn = $this->getDefault()->getSpawn();
}
public function loadLevel($name){
@ -85,11 +92,11 @@ class LevelAPI{
));
}elseif($entity["id"] === OBJECT_PAINTING){ //Painting
$e = $this->server->api->entity->add($this->levels[$name], ENTITY_OBJECT, $entity["id"], $entity);
$e->setPosition($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2], $entity["Rotation"][0], $entity["Rotation"][1]);
$e->setPosition(new Vector3($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2]), $entity["Rotation"][0], $entity["Rotation"][1]);
$e->setHealth($entity["Health"]);
}else{
$e = $this->server->api->entity->add($this->levels[$name], ENTITY_MOB, $entity["id"], $entity);
$e->setPosition($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2], $entity["Rotation"][0], $entity["Rotation"][1]);
$e->setPosition(new Vector3($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2]), $entity["Rotation"][0], $entity["Rotation"][1]);
$e->setHealth($entity["Health"]);
}
}

View file

@ -302,6 +302,9 @@ class PlayerAPI{
$player = $this->server->clients[$CID];
$player->data = $this->getOffline($player->username);
$player->gamemode = $player->data->get("gamemode");
if(($player->level = $this->server->api->level->get($player->data->get("position")["level"])) === false){
$player->level = $this->server->api->level->getDefault();
}
$this->server->query("INSERT OR REPLACE INTO players (clientID, ip, port, name) VALUES (".$player->clientID.", '".$player->ip."', ".$player->port.", '".strtolower($player->username)."');");
}
}

View file

@ -78,7 +78,7 @@ class ServerAPI{
"difficulty" => 1,
"generator" => "",
"generator-settings" => "",
"level-name" => false,
"level-name" => "world",
"server-id" => false,
"enable-query" => false,
"enable-rcon" => false,
@ -170,9 +170,6 @@ class ServerAPI{
}
$this->loadAPI("plugin", "PluginAPI"); //fix :(
$this->plugin->init();
$this->server->loadEntities();
}
public function async(callable $callable, $params = array(), $remove = false){