mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-10-16 11:58:00 +00:00
Merge branch 'stable' into next-minor
This commit is contained in:
@@ -324,6 +324,9 @@ class MemoryManager{
|
||||
if(!$property->isPublic()){
|
||||
$property->setAccessible(true);
|
||||
}
|
||||
if(!$property->isInitialized()){
|
||||
continue;
|
||||
}
|
||||
|
||||
$staticCount++;
|
||||
$staticProperties[$className][$property->getName()] = self::continueDump($property->getValue(), $objects, $refCounts, 0, $maxNesting, $maxStringSize);
|
||||
@@ -447,6 +450,9 @@ class MemoryManager{
|
||||
if(!$property->isPublic()){
|
||||
$property->setAccessible(true);
|
||||
}
|
||||
if(!$property->isInitialized($object)){
|
||||
continue;
|
||||
}
|
||||
|
||||
$info["properties"][$name] = self::continueDump($property->getValue($object), $objects, $refCounts, 0, $maxNesting, $maxStringSize);
|
||||
}
|
||||
|
@@ -87,7 +87,7 @@ final class ConsoleReaderThread extends Thread{
|
||||
//Windows sucks, and likes to corrupt UTF-8 file paths when they travel to the subprocess, so we base64 encode
|
||||
//the path to avoid the problem. This is an abysmally shitty hack, but here we are :(
|
||||
$sub = Utils::assumeNotFalse(proc_open(
|
||||
[PHP_BINARY, '-r', sprintf('require base64_decode("%s", true);', base64_encode(Path::join(__DIR__, 'ConsoleReaderChildProcess.php'))), $address],
|
||||
[PHP_BINARY, '-dopcache.enable_cli=0', '-r', sprintf('require base64_decode("%s", true);', base64_encode(Path::join(__DIR__, 'ConsoleReaderChildProcess.php'))), $address],
|
||||
[
|
||||
2 => fopen("php://stderr", "w"),
|
||||
],
|
||||
|
@@ -27,6 +27,8 @@ namespace pocketmine\lang;
|
||||
* This class contains factory methods for all the translations known to PocketMine-MP as per the used version of
|
||||
* pmmp/Language.
|
||||
* This class is generated automatically, do NOT modify it by hand.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class KnownTranslationFactory{
|
||||
public static function ability_flight() : Translatable{
|
||||
@@ -242,10 +244,10 @@ final class KnownTranslationFactory{
|
||||
return new Translatable(KnownTranslationKeys::COMMANDS_ENCHANT_USAGE, []);
|
||||
}
|
||||
|
||||
public static function commands_gamemode_success_other(Translatable|string $param1, Translatable|string $param0) : Translatable{
|
||||
public static function commands_gamemode_success_other(Translatable|string $param0, Translatable|string $param1) : Translatable{
|
||||
return new Translatable(KnownTranslationKeys::COMMANDS_GAMEMODE_SUCCESS_OTHER, [
|
||||
1 => $param1,
|
||||
0 => $param0,
|
||||
1 => $param1,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -915,6 +917,12 @@ final class KnownTranslationFactory{
|
||||
return new Translatable(KnownTranslationKeys::GAMEMODE_INFO, []);
|
||||
}
|
||||
|
||||
public static function gamemode_options(Translatable|string $param0) : Translatable{
|
||||
return new Translatable(KnownTranslationKeys::GAMEMODE_OPTIONS, [
|
||||
0 => $param0,
|
||||
]);
|
||||
}
|
||||
|
||||
public static function invalid_port() : Translatable{
|
||||
return new Translatable(KnownTranslationKeys::INVALID_PORT, []);
|
||||
}
|
||||
|
@@ -26,6 +26,8 @@ namespace pocketmine\lang;
|
||||
/**
|
||||
* This class contains constants for all the translations known to PocketMine-MP as per the used version of pmmp/Language.
|
||||
* This class is generated automatically, do NOT modify it by hand.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
final class KnownTranslationKeys{
|
||||
public const ABILITY_FLIGHT = "ability.flight";
|
||||
@@ -201,6 +203,7 @@ final class KnownTranslationKeys{
|
||||
public const GAMEMODE_SPECTATOR = "gameMode.spectator";
|
||||
public const GAMEMODE_SURVIVAL = "gameMode.survival";
|
||||
public const GAMEMODE_INFO = "gamemode_info";
|
||||
public const GAMEMODE_OPTIONS = "gamemode_options";
|
||||
public const INVALID_PORT = "invalid_port";
|
||||
public const IP_CONFIRM = "ip_confirm";
|
||||
public const IP_GET = "ip_get";
|
||||
|
@@ -72,7 +72,8 @@ final class GeneratorManager{
|
||||
public function addGenerator(string $class, string $name, \Closure $presetValidator, bool $overwrite = false) : void{
|
||||
Utils::testValidInstance($class, Generator::class);
|
||||
|
||||
if(!$overwrite and isset($this->list[$name = strtolower($name)])){
|
||||
$name = strtolower($name);
|
||||
if(!$overwrite and isset($this->list[$name])){
|
||||
throw new \InvalidArgumentException("Alias \"$name\" is already assigned");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user