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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-05 18:59:13 +00:00
commit f80eeee20f
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/pocketmine.yml
View File

@ -99,14 +99,8 @@ network:
enable-encryption: true enable-encryption: true
debug: debug:
#To enable assertion execution, set zend.assertions in your php.ini to 1
assertions:
#Warn if assertions are enabled in php.ini, due to assertions may impact on runtime performance if enabled.
warn-if-enabled: true
#If > 1, it will show debug messages in the console #If > 1, it will show debug messages in the console
level: 1 level: 1
#Enables /status, /gc
commands: false
player: player:
#Choose whether to enable player data saving. #Choose whether to enable player data saving.

2
src/pocketmine/Server.php
View File

@ -1555,7 +1555,7 @@ class Server{
$this->logger->warning(str_repeat("-", 40)); $this->logger->warning(str_repeat("-", 40));
} }
if(((int) ini_get('zend.assertions')) > 0 and ((bool) $this->getProperty("debug.assertions.warn-if-enabled", true)) !== false){ if(((int) ini_get('zend.assertions')) !== -1){
$this->logger->warning("Debugging assertions are enabled, this may impact on performance. To disable them, set `zend.assertions = -1` in php.ini."); $this->logger->warning("Debugging assertions are enabled, this may impact on performance. To disable them, set `zend.assertions = -1` in php.ini.");
} }

11
src/pocketmine/command/SimpleCommandMap.php
View File

@ -100,9 +100,11 @@ class SimpleCommandMap implements CommandMap{
new DefaultGamemodeCommand("defaultgamemode"), new DefaultGamemodeCommand("defaultgamemode"),
new DeopCommand("deop"), new DeopCommand("deop"),
new DifficultyCommand("difficulty"), new DifficultyCommand("difficulty"),
new DumpMemoryCommand("dumpmemory"),
new EffectCommand("effect"), new EffectCommand("effect"),
new EnchantCommand("enchant"), new EnchantCommand("enchant"),
new GamemodeCommand("gamemode"), new GamemodeCommand("gamemode"),
new GarbageCollectorCommand("gc"),
new GiveCommand("give"), new GiveCommand("give"),
new HelpCommand("help"), new HelpCommand("help"),
new KickCommand("kick"), new KickCommand("kick"),
@ -122,6 +124,7 @@ class SimpleCommandMap implements CommandMap{
new SeedCommand("seed"), new SeedCommand("seed"),
new SetWorldSpawnCommand("setworldspawn"), new SetWorldSpawnCommand("setworldspawn"),
new SpawnpointCommand("spawnpoint"), new SpawnpointCommand("spawnpoint"),
new StatusCommand("status"),
new StopCommand("stop"), new StopCommand("stop"),
new TeleportCommand("tp"), new TeleportCommand("tp"),
new TellCommand("tell"), new TellCommand("tell"),
@ -132,14 +135,6 @@ class SimpleCommandMap implements CommandMap{
new VersionCommand("version"), new VersionCommand("version"),
new WhitelistCommand("whitelist") new WhitelistCommand("whitelist")
]); ]);
if($this->server->getProperty("debug.commands", false)){
$this->registerAll("pocketmine", [
new StatusCommand("status"),
new GarbageCollectorCommand("gc"),
new DumpMemoryCommand("dumpmemory")
]);
}
} }

2
src/pocketmine/permission/DefaultPermissions.php
View File

@ -119,7 +119,7 @@ abstract class DefaultPermissions{
self::registerPermission(new Permission(self::ROOT . ".command.seed", "Allows the user to view the seed of the world", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.seed", "Allows the user to view the seed of the world", Permission::DEFAULT_OP), $commands);
self::registerPermission(new Permission(self::ROOT . ".command.status", "Allows the user to view the server performance", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.status", "Allows the user to view the server performance", Permission::DEFAULT_OP), $commands);
self::registerPermission(new Permission(self::ROOT . ".command.gc", "Allows the user to fire garbage collection tasks", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.gc", "Allows the user to fire garbage collection tasks", Permission::DEFAULT_OP), $commands);
self::registerPermission(new Permission(self::ROOT . ".command.dumpmemory", "Allows the user to dump memory contents", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.dumpmemory", "Allows the user to dump memory contents", Permission::DEFAULT_FALSE), $commands);
self::registerPermission(new Permission(self::ROOT . ".command.timings", "Allows the user to records timings for all plugin events", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.timings", "Allows the user to records timings for all plugin events", Permission::DEFAULT_OP), $commands);
self::registerPermission(new Permission(self::ROOT . ".command.spawnpoint", "Allows the user to change player's spawnpoint", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.spawnpoint", "Allows the user to change player's spawnpoint", Permission::DEFAULT_OP), $commands);
self::registerPermission(new Permission(self::ROOT . ".command.setworldspawn", "Allows the user to change the world spawn", Permission::DEFAULT_OP), $commands); self::registerPermission(new Permission(self::ROOT . ".command.setworldspawn", "Allows the user to change the world spawn", Permission::DEFAULT_OP), $commands);