mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-03 00:29:54 +00:00
Merge branch '3.6' into 3.7
This commit is contained in:
commit
9c01ecbe7e
@ -2583,7 +2583,8 @@ class Server{
|
|||||||
$this->getLogger()->debug("[Auto Save] Saving worlds...");
|
$this->getLogger()->debug("[Auto Save] Saving worlds...");
|
||||||
$start = microtime(true);
|
$start = microtime(true);
|
||||||
$this->doAutoSave();
|
$this->doAutoSave();
|
||||||
$this->getLogger()->debug("[Auto Save] Save completed in " . round(microtime(true) - $start, 3) . "s");
|
$time = (microtime(true) - $start);
|
||||||
|
$this->getLogger()->debug("[Auto Save] Save completed in " . ($time >= 1 ? round($time, 3) . "s" : round($time * 1000) . "ms"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->sendUsageTicker > 0 and --$this->sendUsageTicker === 0){
|
if($this->sendUsageTicker > 0 and --$this->sendUsageTicker === 0){
|
||||||
|
@ -106,7 +106,7 @@ class Flat extends Generator{
|
|||||||
$split = array_map('\trim', explode(',', $layers));
|
$split = array_map('\trim', explode(',', $layers));
|
||||||
$y = 0;
|
$y = 0;
|
||||||
foreach($split as $line){
|
foreach($split as $line){
|
||||||
preg_match('#^(?:(\d+)x)?(.+)$#', $line, $matches);
|
preg_match('#^(?:(\d+)[x|*])?(.+)$#', $line, $matches);
|
||||||
if(count($matches) !== 3){
|
if(count($matches) !== 3){
|
||||||
throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\"");
|
throw new InvalidGeneratorOptionsException("Invalid preset layer \"$line\"");
|
||||||
}
|
}
|
||||||
|
@ -55,19 +55,22 @@ class AvailableCommandsPacket extends DataPacket{
|
|||||||
public const ARG_TYPE_FLOAT = 0x02;
|
public const ARG_TYPE_FLOAT = 0x02;
|
||||||
public const ARG_TYPE_VALUE = 0x03;
|
public const ARG_TYPE_VALUE = 0x03;
|
||||||
public const ARG_TYPE_WILDCARD_INT = 0x04;
|
public const ARG_TYPE_WILDCARD_INT = 0x04;
|
||||||
public const ARG_TYPE_TARGET = 0x05;
|
public const ARG_TYPE_OPERATOR = 0x05;
|
||||||
public const ARG_TYPE_WILDCARD_TARGET = 0x06;
|
public const ARG_TYPE_TARGET = 0x06;
|
||||||
|
|
||||||
public const ARG_TYPE_STRING = 0x0f;
|
public const ARG_TYPE_FILEPATH = 0x0f;
|
||||||
public const ARG_TYPE_POSITION = 0x10;
|
|
||||||
|
|
||||||
public const ARG_TYPE_MESSAGE = 0x13;
|
public const ARG_TYPE_STRING = 0x1c;
|
||||||
|
|
||||||
public const ARG_TYPE_RAWTEXT = 0x15;
|
public const ARG_TYPE_POSITION = 0x1e;
|
||||||
|
|
||||||
public const ARG_TYPE_JSON = 0x18;
|
public const ARG_TYPE_MESSAGE = 0x21;
|
||||||
|
|
||||||
public const ARG_TYPE_COMMAND = 0x1f;
|
public const ARG_TYPE_RAWTEXT = 0x23;
|
||||||
|
|
||||||
|
public const ARG_TYPE_JSON = 0x26;
|
||||||
|
|
||||||
|
public const ARG_TYPE_COMMAND = 0x2d;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Enums are a little different: they are composed as follows:
|
* Enums are a little different: they are composed as follows:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user