mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-10-18 12:04:46 +00:00
Merge branch 'stable'
This commit is contained in:
@@ -47,13 +47,20 @@ class Attribute{
|
||||
public const HORSE_JUMP_STRENGTH = self::MC_PREFIX . "horse.jump_strength";
|
||||
public const ZOMBIE_SPAWN_REINFORCEMENTS = self::MC_PREFIX . "zombie.spawn_reinforcements";
|
||||
|
||||
/** @var string */
|
||||
protected $id;
|
||||
/** @var float */
|
||||
protected $minValue;
|
||||
/** @var float */
|
||||
protected $maxValue;
|
||||
/** @var float */
|
||||
protected $defaultValue;
|
||||
/** @var float */
|
||||
protected $currentValue;
|
||||
/** @var bool */
|
||||
protected $shouldSend;
|
||||
|
||||
/** @var bool */
|
||||
protected $desynchronized = true;
|
||||
|
||||
/** @var Attribute[] */
|
||||
|
@@ -71,6 +71,7 @@ abstract class Living extends Entity{
|
||||
protected $gravity = 0.08;
|
||||
protected $drag = 0.02;
|
||||
|
||||
/** @var int */
|
||||
protected $attackTime = 0;
|
||||
|
||||
/** @var int */
|
||||
@@ -78,6 +79,7 @@ abstract class Living extends Entity{
|
||||
/** @var int */
|
||||
protected $maxDeadTicks = 25;
|
||||
|
||||
/** @var float */
|
||||
protected $jumpVelocity = 0.42;
|
||||
|
||||
/** @var EffectManager */
|
||||
|
@@ -43,8 +43,10 @@ class Squid extends WaterAnimal{
|
||||
|
||||
/** @var Vector3|null */
|
||||
public $swimDirection = null;
|
||||
/** @var float */
|
||||
public $swimSpeed = 0.1;
|
||||
|
||||
/** @var int */
|
||||
private $switchDirectionTicker = 0;
|
||||
|
||||
public function initEntity(CompoundTag $nbt) : void{
|
||||
|
@@ -46,6 +46,7 @@ class PrimedTNT extends Entity implements Explosive{
|
||||
protected $gravity = 0.04;
|
||||
protected $drag = 0.02;
|
||||
|
||||
/** @var int */
|
||||
protected $fuse;
|
||||
|
||||
public $canCollide = false;
|
||||
|
Reference in New Issue
Block a user