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

Save player position, removed several methods from PluginAPI

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-01 20:32:49 +01:00
parent f8d91b5888
commit 573fe0e5cc
5 changed files with 108 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/API/PlayerAPI.php
View File

@ -326,84 +326,4 @@ class PlayerAPI{
} }
return false; return false;
} }
public function broadcastPacket(array $players, RakNetDataPacket $packet){
foreach($players as $p){
$p->dataPacket(clone $packet);
}
}
public function online(){
$o = array();
foreach(Player::$list as $p){
if($p->auth === true){
$o[] = $p->username;
}
}
return $o;
}
//TODO (remove)
public function add($CID){
if(isset(Player::$list[$CID])){
$player =Player::$list[$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();
$player->data->set("position", array(
"level" => $player->level->getName(),
"x" => $player->level->getSpawn()->x,
"y" => $player->level->getSpawn()->y,
"z" => $player->level->getSpawn()->z,
));
}
}
}
public function getOffline($name){
$iname = strtolower($name);
$default = array(
"caseusername" => $name,
"position" => array(
"level" => $this->server->spawn->level->getName(),
"x" => $this->server->spawn->x,
"y" => $this->server->spawn->y,
"z" => $this->server->spawn->z,
),
"spawn" => array(
"level" => $this->server->spawn->level->getName(),
"x" => $this->server->spawn->x,
"y" => $this->server->spawn->y,
"z" => $this->server->spawn->z,
),
"inventory" => array_fill(0, PLAYER_SURVIVAL_SLOTS, array(AIR, 0, 0)),
"hotbar" => array(0, -1, -1, -1, -1, -1, -1, -1, -1),
"armor" => array_fill(0, 4, array(AIR, 0)),
"gamemode" => $this->server->gamemode,
"health" => 20,
"lastIP" => "",
"lastID" => 0,
"achievements" => array(),
);
if(!file_exists(DATA_PATH."players/".$iname.".yml")){
console("[NOTICE] Player data not found for \"".$iname."\", creating new profile");
$data = new Config(DATA_PATH."players/".$iname.".yml", Config::YAML, $default);
$data->save();
}else{
$data = new Config(DATA_PATH."players/".$iname.".yml", Config::YAML, $default);
}
if(($data->get("gamemode") & 0x01) === 1){
$data->set("health", 20);
}
$this->server->handle("player.offline.get", $data);
return $data;
}
public function saveOffline(Config $data){
$this->server->handle("player.offline.save", $data);
$data->save();
}
} }

6
src/EntityOLD.php
View File

@ -588,7 +588,7 @@ class EntityOLD extends Position{
$pk->yaw = $this->yaw; $pk->yaw = $this->yaw;
$pk->pitch = $this->pitch; $pk->pitch = $this->pitch;
$pk->bodyYaw = $this->yaw; $pk->bodyYaw = $this->yaw;
$this->server->api->player->broadcastPacket($players, $pk); Player::broadcastPacket($players, $pk);
}else{ }else{
$pk = new MoveEntityPacket_PosRot; $pk = new MoveEntityPacket_PosRot;
$pk->eid = $this->eid; $pk->eid = $this->eid;
@ -597,7 +597,7 @@ class EntityOLD extends Position{
$pk->z = $this->z; $pk->z = $this->z;
$pk->yaw = $this->yaw; $pk->yaw = $this->yaw;
$pk->pitch = $this->pitch; $pk->pitch = $this->pitch;
$this->server->api->player->broadcastPacket($players, $pk); Player::broadcastPacket($players, $pk);
} }
} }
}else{ }else{
@ -1029,7 +1029,7 @@ class EntityOLD extends Position{
$pk->z = -256; $pk->z = -256;
$pk->yaw = 0; $pk->yaw = 0;
$pk->pitch = 0; $pk->pitch = 0;
$this->server->api->player->broadcastPacket($this->level->players, $pk); Player::broadcastPacket($this->level->players, $pk);
}else{ }else{
$this->server->api->dhandle("entity.event", array("entity" => $this, "event" => 3)); //Entity dead $this->server->api->dhandle("entity.event", array("entity" => $this, "event" => 3)); //Entity dead
} }

139
src/Player.php
View File

@ -119,6 +119,59 @@ class Player extends PlayerEntity{
public static function getAll(){ public static function getAll(){
return Player::$list; return Player::$list;
} }
public static function getOffline($name){
$server = ServerAPI::request();
$iname = strtolower($name);
$default = array(
"caseusername" => $name,
"position" => array(
"level" => $server->spawn->level->getName(),
"x" => $server->spawn->x,
"y" => $server->spawn->y,
"z" => $server->spawn->z,
),
"spawn" => array(
"level" => $server->spawn->level->getName(),
"x" => $server->spawn->x,
"y" => $server->spawn->y,
"z" => $server->spawn->z,
),
"inventory" => array_fill(0, PLAYER_SURVIVAL_SLOTS, array(AIR, 0, 0)),
"hotbar" => array(0, -1, -1, -1, -1, -1, -1, -1, -1),
"armor" => array_fill(0, 4, array(AIR, 0)),
"gamemode" => $server->gamemode,
"health" => 20,
"lastIP" => "",
"lastID" => 0,
"achievements" => array(),
);
if(!file_exists(DATA_PATH."players/".$iname.".yml")){
console("[NOTICE] Player data not found for \"".$iname."\", creating new profile");
$data = new Config(DATA_PATH."players/".$iname.".yml", Config::YAML, $default);
$data->save();
}else{
$data = new Config(DATA_PATH."players/".$iname.".yml", Config::YAML, $default);
}
if(($data->get("gamemode") & 0x01) === 1){
$data->set("health", 20);
}
$server->handle("player.offline.get", $data);
return $data;
}
public static function saveOffline(Config $data){
ServerAPI::request()->handle("player.offline.save", $data);
$data->save();
}
public static function broadcastPacket(array $players, RakNetDataPacket $packet){
foreach($players as $player){
$player->dataPacket(clone $packet);
}
}
/** /**
* @param integer $clientID * @param integer $clientID
@ -293,43 +346,39 @@ class Player extends PlayerEntity{
} }
public function save(){ public function save(){
if($this->entity instanceof Entity){ $this->data->set("achievements", $this->achievements);
$this->data->set("achievements", $this->achievements); $this->data->set("position", array(
$this->data->set("position", array( "level" => $this->level->getName(),
"level" => $this->entity->level->getName(), "x" => $this->x,
"x" => $this->entity->x, "y" => $this->y,
"y" => $this->entity->y, "z" => $this->z,
"z" => $this->entity->z, ));
)); $this->data->set("spawn", array(
$this->data->set("spawn", array( "level" => $this->spawnPosition->level->getName(),
"level" => $this->spawnPosition->level->getName(), "x" => $this->spawnPosition->x,
"x" => $this->spawnPosition->x, "y" => $this->spawnPosition->y,
"y" => $this->spawnPosition->y, "z" => $this->spawnPosition->z,
"z" => $this->spawnPosition->z, ));
)); $inv = array();
$inv = array(); foreach($this->inventory as $slot => $item){
foreach($this->inventory as $slot => $item){ if($item instanceof Item){
if($item instanceof Item){ if($slot < (($this->gamemode & 0x01) === 0 ? PLAYER_SURVIVAL_SLOTS:PLAYER_CREATIVE_SLOTS)){
if($slot < (($this->gamemode & 0x01) === 0 ? PLAYER_SURVIVAL_SLOTS:PLAYER_CREATIVE_SLOTS)){ $inv[$slot] = array($item->getID(), $item->getMetadata(), $item->count);
$inv[$slot] = array($item->getID(), $item->getMetadata(), $item->count);
}
} }
} }
$this->data->set("inventory", $inv);
$this->data->set("hotbar", $this->hotbar);
$armor = array();
foreach($this->armor as $slot => $item){
if($item instanceof Item){
$armor[$slot] = array($item->getID(), $item->getMetadata());
}
}
$this->data->set("armor", $armor);
if($this->entity instanceof Entity){
$this->data->set("health", $this->entity->getHealth());
}
$this->data->set("gamemode", $this->gamemode);
} }
$this->data->set("inventory", $inv);
$this->data->set("hotbar", $this->hotbar);
$armor = array();
foreach($this->armor as $slot => $item){
if($item instanceof Item){
$armor[$slot] = array($item->getID(), $item->getMetadata());
}
}
$this->data->set("armor", $armor);
//$this->data->set("health", $this->getHealth());
$this->data->set("gamemode", $this->gamemode);
} }
/** /**
@ -360,8 +409,7 @@ class Player extends PlayerEntity{
$this->resendQueue = array(); $this->resendQueue = array();
$this->ackQueue = array(); $this->ackQueue = array();
if($this->username != "" and ($this->data instanceof Config)){ if($this->username != "" and ($this->data instanceof Config)){
//TODO Player::saveOffline($this->data);
//$this->saveOffline($player->data);
} }
if($msg === true and $this->username != "" and $this->spawned !== false){ if($msg === true and $this->username != "" and $this->spawned !== false){
$this->server->api->chat->broadcast($this->username." left the game"); $this->server->api->chat->broadcast($this->username." left the game");
@ -1282,7 +1330,18 @@ class Player extends PlayerEntity{
} }
} }
$this->server->api->player->add($this->CID); $this->data = Player::getOffline($this->username);
$this->gamemode = $this->data->get("gamemode");
if(($this->level = $this->server->api->level->get($this->data->get("position")["level"])) === false){
$this->level = $this->server->api->level->getDefault();
$this->data->set("position", array(
"level" => $this->level->getName(),
"x" => $this->level->getSpawn()->x,
"y" => $this->level->getSpawn()->y,
"z" => $this->level->getSpawn()->z,
));
}
if($this->server->api->handle("player.join", $this) === false){ if($this->server->api->handle("player.join", $this) === false){
$this->close("join cancelled", false); $this->close("join cancelled", false);
return; return;
@ -1327,7 +1386,7 @@ class Player extends PlayerEntity{
$this->data->set("lastIP", $this->ip); $this->data->set("lastIP", $this->ip);
$this->data->set("lastID", $this->clientID); $this->data->set("lastID", $this->clientID);
$this->server->api->player->saveOffline($this->data); Player::saveOffline($this->data);
$pk = new LoginStatusPacket; $pk = new LoginStatusPacket;
@ -2000,7 +2059,7 @@ class Player extends PlayerEntity{
$pk->z = $ob->z; $pk->z = $ob->z;
$pk->case1 = 1; $pk->case1 = 1;
$pk->case2 = 0; $pk->case2 = 0;
$this->server->api->player->broadcastPacket($this->level->players, $pk); Player::broadcastPacket($this->level->players, $pk);
} }
}elseif($this->windows[$packet->windowid] instanceof ChestTile){ }elseif($this->windows[$packet->windowid] instanceof ChestTile){
$pk = new TileEventPacket; $pk = new TileEventPacket;
@ -2009,7 +2068,7 @@ class Player extends PlayerEntity{
$pk->z = $this->windows[$packet->windowid]->z; $pk->z = $this->windows[$packet->windowid]->z;
$pk->case1 = 1; $pk->case1 = 1;
$pk->case2 = 0; $pk->case2 = 0;
$this->server->api->player->broadcastPacket($this->level->players, $pk); Player::broadcastPacket($this->level->players, $pk);
} }
} }
unset($this->windows[$packet->windowid]); unset($this->windows[$packet->windowid]);

4
src/tile/ContainerTileTrait.php
View File

@ -59,7 +59,7 @@ trait ContainerTileTrait{
$pk->z = $ob->z; $pk->z = $ob->z;
$pk->case1 = 1; $pk->case1 = 1;
$pk->case2 = 2; $pk->case2 = 2;
$this->server->api->player->broadcastPacket($all, $pk); Player::broadcastPacket($all, $pk);
for($s = 0; $s < ChestTile::SLOTS; ++$s){ for($s = 0; $s < ChestTile::SLOTS; ++$s){
$slot = $ob->getSlot($s); $slot = $ob->getSlot($s);
if($slot->getID() > AIR and $slot->count > 0){ if($slot->getID() > AIR and $slot->count > 0){
@ -76,7 +76,7 @@ trait ContainerTileTrait{
$pk->z = $this->z; $pk->z = $this->z;
$pk->case1 = 1; $pk->case1 = 1;
$pk->case2 = 2; $pk->case2 = 2;
$this->server->api->player->broadcastPacket($this->level->getPlayers(), $pk); Player::broadcastPacket($this->level->getPlayers(), $pk);
for($s = 0; $s < ChestTile::SLOTS; ++$s){ for($s = 0; $s < ChestTile::SLOTS; ++$s){
$slot = $this->getSlot($s); $slot = $this->getSlot($s);
if($slot->getID() > AIR and $slot->count > 0){ if($slot->getID() > AIR and $slot->count > 0){

8
src/world/Level.php
View File

@ -103,7 +103,7 @@ class Level{
$pk = new SetTimePacket; $pk = new SetTimePacket;
$pk->time = (int) $this->time; $pk->time = (int) $this->time;
$pk->started = $this->stopTime == false; $pk->started = $this->stopTime == false;
$this->server->api->player->broadcastPacket($this->players, $pk); Player::broadcastPacket($this->players, $pk);
} }
} }
@ -143,7 +143,7 @@ class Level{
$pk->z = $b->z; $pk->z = $b->z;
$pk->block = $b->getID(); $pk->block = $b->getID();
$pk->meta = $b->getMetadata(); $pk->meta = $b->getMetadata();
$this->server->api->player->broadcastPacket($this->players, $pk); Player::broadcastPacket($this->players, $pk);
} }
} }
} }
@ -259,7 +259,7 @@ class Level{
$pk->z = $pos->z; $pk->z = $pos->z;
$pk->block = $block->getID(); $pk->block = $block->getID();
$pk->meta = $block->getMetadata(); $pk->meta = $block->getMetadata();
$this->server->api->player->broadcastPacket($this->players, $pk); Player::broadcastPacket($this->players, $pk);
}elseif($direct === false){ }elseif($direct === false){
if(!($pos instanceof Position)){ if(!($pos instanceof Position)){
$pos = new Position($pos->x, $pos->y, $pos->z, $this); $pos = new Position($pos->x, $pos->y, $pos->z, $this);
@ -303,7 +303,7 @@ class Level{
$pk->z = $pos->z; $pk->z = $pos->z;
$pk->block = $block->getID(); $pk->block = $block->getID();
$pk->meta = $block->getMetadata(); $pk->meta = $block->getMetadata();
$this->server->api->player->broadcastPacket($this->players, $pk); Player::broadcastPacket($this->players, $pk);
}else{ }else{
$index = PMFLevel::getIndex($pos->x >> 4, $pos->z >> 4); $index = PMFLevel::getIndex($pos->x >> 4, $pos->z >> 4);
if(ADVANCED_CACHE == true){ if(ADVANCED_CACHE == true){