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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	changelogs/3.14.md
#	resources/vanilla
#	src/VersionInfo.php
#	src/entity/Attribute.php
This commit is contained in:
Dylan K. Taylor
2020-07-08 11:46:02 +01:00
parent b79aa04530 b2249f93c0
commit da798817b5
6 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/entity/Attribute.php
View File

@@ -46,6 +46,7 @@ class Attribute{
public const FALL_DAMAGE = self::MC_PREFIX . "fall_damage";
public const HORSE_JUMP_STRENGTH = self::MC_PREFIX . "horse.jump_strength";
public const ZOMBIE_SPAWN_REINFORCEMENTS = self::MC_PREFIX . "zombie.spawn_reinforcements";
public const LAVA_MOVEMENT = self::MC_PREFIX . "lava_movement";
/** @var string */
protected $id;

1
src/entity/AttributeFactory.php
View File

@@ -48,6 +48,7 @@ final class AttributeFactory{
$this->register(Attribute::FALL_DAMAGE, 0.0, 340282346638528859811704183484516925440.0, 1.0);
$this->register(Attribute::HORSE_JUMP_STRENGTH, 0.0, 2.0, 0.7);
$this->register(Attribute::ZOMBIE_SPAWN_REINFORCEMENTS, 0.0, 1.0, 0.0);
$this->register(Attribute::LAVA_MOVEMENT, 0.0, 340282346638528859811704183484516925440.0, 0.02);
}
public function get(string $id) : ?Attribute{

3
src/scheduler/TaskHandler.php
View File

@@ -55,6 +55,9 @@ class TaskHandler{
private $ownerName;
public function __construct(Task $task, int $taskId, int $delay = -1, int $period = -1, ?string $ownerName = null){
if($task->getHandler() !== null){
throw new \InvalidArgumentException("Cannot assign multiple handlers to the same task");
}
$this->task = $task;
$this->taskId = $taskId;
$this->delay = $delay;

6
src/utils/MainLogger.php
View File

@@ -153,12 +153,12 @@ class MainLogger extends \AttachableThreadedLogger implements \BufferedLogger{
$this->buffer(function() use ($e, $trace) : void{
$this->critical(self::printExceptionMessage($e));
foreach(Utils::printableTrace($trace) as $line){
$this->debug($line, true);
$this->critical($line);
}
for($prev = $e->getPrevious(); $prev !== null; $prev = $prev->getPrevious()){
$this->debug("Previous: " . self::printExceptionMessage($prev), true);
$this->critical("Previous: " . self::printExceptionMessage($prev));
foreach(Utils::printableTrace($prev->getTrace()) as $line){
$this->debug(" " . $line, true);
$this->critical(" " . $line);
}
}
});