mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Level: rename getName() to getDisplayName()

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-17 16:46:56 +00:00
parent 76f1ee1827
commit e341f3dce2
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -1869,7 +1869,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
$this->networkSession->getIp(), $this->networkSession->getIp(),
$this->networkSession->getPort(), $this->networkSession->getPort(),
$this->id, $this->id,
$this->level->getName(), $this->level->getDisplayName(),
round($this->x, 4), round($this->x, 4),
round($this->y, 4), round($this->y, 4),
round($this->z, 4) round($this->z, 4)

2
src/pocketmine/command/defaults/StatusCommand.php
View File

@ -107,7 +107,7 @@ class StatusCommand extends VanillaCommand{
} }
foreach($server->getLevelManager()->getLevels() as $level){ foreach($server->getLevelManager()->getLevels() as $level){
$levelName = $level->getFolderName() !== $level->getName() ? " (" . $level->getName() . ")" : ""; $levelName = $level->getFolderName() !== $level->getDisplayName() ? " (" . $level->getDisplayName() . ")" : "";
$timeColor = ($level->getTickRate() > 1 or $level->getTickRateTime() > 40) ? TextFormat::RED : TextFormat::YELLOW; $timeColor = ($level->getTickRate() > 1 or $level->getTickRateTime() > 40) ? TextFormat::RED : TextFormat::YELLOW;
$tickRate = $level->getTickRate() > 1 ? " (tick rate " . $level->getTickRate() . ")" : ""; $tickRate = $level->getTickRate() > 1 ? " (tick rate " . $level->getTickRate() . ")" : "";
$sender->sendMessage(TextFormat::GOLD . "World \"{$level->getFolderName()}\"$levelName: " . $sender->sendMessage(TextFormat::GOLD . "World \"{$level->getFolderName()}\"$levelName: " .

2
src/pocketmine/event/server/QueryRegenerateEvent.php
View File

@ -89,7 +89,7 @@ class QueryRegenerateEvent extends ServerEvent{
$this->version = $server->getVersion(); $this->version = $server->getVersion();
$this->server_engine = $server->getName() . " " . $server->getPocketMineVersion(); $this->server_engine = $server->getName() . " " . $server->getPocketMineVersion();
$level = $server->getLevelManager()->getDefaultLevel(); $level = $server->getLevelManager()->getDefaultLevel();
$this->map = $level === null ? "unknown" : $level->getName(); $this->map = $level === null ? "unknown" : $level->getDisplayName();
$this->numPlayers = count($this->players); $this->numPlayers = count($this->players);
$this->maxPlayers = $server->getMaxPlayers(); $this->maxPlayers = $server->getMaxPlayers();
$this->whitelist = $server->hasWhitelist() ? "on" : "off"; $this->whitelist = $server->hasWhitelist() ? "on" : "off";

7
src/pocketmine/level/Level.php
View File

@ -2803,16 +2803,17 @@ class Level implements ChunkManager, Metadatable{
} }
/** /**
* Returns the Level name * Returns the Level display name.
* WARNING: This is NOT guaranteed to be unique. Multiple levels at runtime may share the same display name.
* *
* @return string * @return string
*/ */
public function getName() : string{ public function getDisplayName() : string{
return $this->displayName; return $this->displayName;
} }
/** /**
* Returns the Level folder name * Returns the Level folder name. This will not change at runtime and will be unique to a level per runtime.
* *
* @return string * @return string
*/ */

8
src/pocketmine/level/LevelManager.php
View File

@ -179,7 +179,7 @@ class LevelManager{
return false; return false;
} }
$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.unloading", [$level->getName()])); $this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.level.unloading", [$level->getDisplayName()]));
foreach($level->getPlayers() as $player){ foreach($level->getPlayers() as $player){
if($level === $this->levelDefault or $this->levelDefault === null){ if($level === $this->levelDefault or $this->levelDefault === null){
$player->close($player->getLeaveMessage(), "Forced default level unload"); $player->close($player->getLeaveMessage(), "Forced default level unload");
@ -382,14 +382,14 @@ class LevelManager{
if($r > $this->baseTickRate){ if($r > $this->baseTickRate){
$level->tickRateCounter = $level->getTickRate(); $level->tickRateCounter = $level->getTickRate();
} }
$this->server->getLogger()->debug("Raising level \"{$level->getName()}\" tick rate to {$level->getTickRate()} ticks"); $this->server->getLogger()->debug("Raising level \"{$level->getDisplayName()}\" tick rate to {$level->getTickRate()} ticks");
}elseif($tickMs >= 50){ }elseif($tickMs >= 50){
if($level->getTickRate() === $this->baseTickRate){ if($level->getTickRate() === $this->baseTickRate){
$level->setTickRate(max($this->baseTickRate + 1, min($this->autoTickRateLimit, (int) floor($tickMs / 50)))); $level->setTickRate(max($this->baseTickRate + 1, min($this->autoTickRateLimit, (int) floor($tickMs / 50))));
$this->server->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate())); $this->server->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getDisplayName(), (int) round($tickMs, 2), $level->getTickRate()));
}elseif(($tickMs / $level->getTickRate()) >= 50 and $level->getTickRate() < $this->autoTickRateLimit){ }elseif(($tickMs / $level->getTickRate()) >= 50 and $level->getTickRate() < $this->autoTickRateLimit){
$level->setTickRate($level->getTickRate() + 1); $level->setTickRate($level->getTickRate() + 1);
$this->server->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getName(), (int) round($tickMs, 2), $level->getTickRate())); $this->server->getLogger()->debug(sprintf("Level \"%s\" took %gms, setting tick rate to %d ticks", $level->getDisplayName(), (int) round($tickMs, 2), $level->getTickRate()));
} }
$level->tickRateCounter = $level->getTickRate(); $level->tickRateCounter = $level->getTickRate();
} }

2
src/pocketmine/level/Location.php
View File

@ -76,7 +76,7 @@ class Location extends Position{
} }
public function __toString(){ public function __toString(){
return "Location (level=" . ($this->isValid() ? $this->getLevel()->getName() : "null") . ", x=$this->x, y=$this->y, z=$this->z, yaw=$this->yaw, pitch=$this->pitch)"; return "Location (level=" . ($this->isValid() ? $this->getLevel()->getDisplayName() : "null") . ", x=$this->x, y=$this->y, z=$this->z, yaw=$this->yaw, pitch=$this->pitch)";
} }
public function equals(Vector3 $v) : bool{ public function equals(Vector3 $v) : bool{

2
src/pocketmine/level/Position.php
View File

@ -118,7 +118,7 @@ class Position extends Vector3{
} }
public function __toString(){ public function __toString(){
return "Position(level=" . ($this->isValid() ? $this->getLevel()->getName() : "null") . ",x=" . $this->x . ",y=" . $this->y . ",z=" . $this->z . ")"; return "Position(level=" . ($this->isValid() ? $this->getLevel()->getDisplayName() : "null") . ",x=" . $this->x . ",y=" . $this->y . ",z=" . $this->z . ")";
} }
public function equals(Vector3 $v) : bool{ public function equals(Vector3 $v) : bool{

2
src/pocketmine/metadata/BlockMetadataStore.php
View File

@ -37,7 +37,7 @@ class BlockMetadataStore extends MetadataStore{
private function disambiguate(Block $block, string $metadataKey) : string{ private function disambiguate(Block $block, string $metadataKey) : string{
if($block->getLevel() !== $this->owningLevel){ if($block->getLevel() !== $this->owningLevel){
throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getName()); throw new \InvalidStateException("Block does not belong to world " . $this->owningLevel->getDisplayName());
} }
return $block->x . ":" . $block->y . ":" . $block->z . ":" . $metadataKey; return $block->x . ":" . $block->y . ":" . $block->z . ":" . $metadataKey;
} }

2
src/pocketmine/metadata/LevelMetadataStore.php
View File

@ -30,7 +30,7 @@ use function strtolower;
class LevelMetadataStore extends MetadataStore{ class LevelMetadataStore extends MetadataStore{
private function disambiguate(Level $level, string $metadataKey) : string{ private function disambiguate(Level $level, string $metadataKey) : string{
return strtolower($level->getName()) . ":" . $metadataKey; return strtolower($level->getFolderName()) . ":" . $metadataKey;
} }
public function getMetadata(Level $subject, string $metadataKey){ public function getMetadata(Level $subject, string $metadataKey){