Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor
2019-01-04 23:28:44 +00:00
258 changed files with 1322 additions and 40 deletions

View File

@ -23,6 +23,9 @@ declare(strict_types=1);
namespace pocketmine\entity;
use function max;
use function min;
class Attribute{
public const MC_PREFIX = "minecraft:";

View File

@ -23,6 +23,8 @@ declare(strict_types=1);
namespace pocketmine\entity;
use function array_filter;
class AttributeMap implements \ArrayAccess{
/** @var Attribute[] */
private $attributes = [];

View File

@ -25,6 +25,10 @@ namespace pocketmine\entity;
use pocketmine\item\Item;
use pocketmine\math\Vector3;
use function assert;
use function is_float;
use function is_int;
use function is_string;
class DataPropertyManager{

View File

@ -29,6 +29,9 @@ use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\EntityRegainHealthEvent;
use pocketmine\event\player\PlayerExhaustEvent;
use pocketmine\utils\Color;
use function constant;
use function defined;
use function strtoupper;
class Effect{
public const SPEED = 1;

View File

@ -24,6 +24,8 @@ declare(strict_types=1);
namespace pocketmine\entity;
use pocketmine\utils\Color;
use function max;
use const INT32_MAX;
class EffectInstance{
/** @var Effect */

View File

@ -76,6 +76,23 @@ use pocketmine\Server;
use pocketmine\timings\Timings;
use pocketmine\timings\TimingsHandler;
use pocketmine\utils\Utils;
use function abs;
use function array_unique;
use function assert;
use function cos;
use function count;
use function current;
use function deg2rad;
use function floor;
use function get_class;
use function in_array;
use function is_array;
use function is_infinite;
use function is_nan;
use function lcg_value;
use function reset;
use function sin;
use const M_PI_2;
abstract class Entity extends Location implements Metadatable, EntityIds{

View File

@ -56,6 +56,18 @@ use pocketmine\network\mcpe\protocol\PlayerSkinPacket;
use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
use pocketmine\Player;
use pocketmine\utils\UUID;
use function array_filter;
use function array_merge;
use function array_rand;
use function array_values;
use function ceil;
use function max;
use function min;
use function mt_rand;
use function random_int;
use function strlen;
use const INT32_MAX;
use const INT32_MIN;
class Human extends Creature implements ProjectileSource, InventoryHolder{

View File

@ -52,6 +52,19 @@ use pocketmine\Player;
use pocketmine\timings\Timings;
use pocketmine\utils\Binary;
use pocketmine\utils\Color;
use function abs;
use function array_shift;
use function atan2;
use function ceil;
use function count;
use function floor;
use function lcg_value;
use function max;
use function min;
use function mt_getrandmax;
use function mt_rand;
use function sqrt;
use const M_PI;
abstract class Living extends Entity implements Damageable{

View File

@ -23,6 +23,10 @@ declare(strict_types=1);
namespace pocketmine\entity;
use function json_decode;
use function json_encode;
use function strlen;
class Skin{
/** @var string */

View File

@ -30,6 +30,10 @@ use pocketmine\item\ItemFactory;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\EntityEventPacket;
use function atan2;
use function mt_rand;
use function sqrt;
use const M_PI;
class Squid extends WaterAnimal{
public const NETWORK_ID = self::SQUID;

View File

@ -25,6 +25,7 @@ namespace pocketmine\entity;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use function mt_rand;
class Zombie extends Monster{
public const NETWORK_ID = self::ZOMBIE;

View File

@ -32,6 +32,7 @@ use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
use function get_class;
class FallingBlock extends Entity{
public const NETWORK_ID = self::FALLING_BLOCK;

View File

@ -32,6 +32,7 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
use pocketmine\Player;
use function get_class;
class ItemEntity extends Entity{
public const NETWORK_ID = self::ITEM;

View File

@ -39,6 +39,7 @@ use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\AddPaintingPacket;
use pocketmine\Player;
use function ceil;
class Painting extends Entity{
public const NETWORK_ID = self::PAINTING;

View File

@ -36,6 +36,8 @@ use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
use pocketmine\Player;
use function mt_rand;
use function sqrt;
class Arrow extends Projectile{
public const NETWORK_ID = self::ARROW;

View File

@ -27,6 +27,7 @@ use pocketmine\event\entity\ProjectileHitEvent;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\utils\Color;
use function mt_rand;
class ExperienceBottle extends Throwable{
public const NETWORK_ID = self::XP_BOTTLE;

View File

@ -43,6 +43,12 @@ use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
use pocketmine\timings\Timings;
use function assert;
use function atan2;
use function ceil;
use function sqrt;
use const M_PI;
use const PHP_INT_MAX;
abstract class Projectile extends Entity{

View File

@ -35,6 +35,8 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\utils\Color;
use function round;
use function sqrt;
class SplashPotion extends Throwable{

View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\entity\utils;
use pocketmine\math\Math;
use function max;
abstract class ExperienceUtils{