From 82d7e19bd261273198aba5a97cb51b205dd40d51 Mon Sep 17 00:00:00 2001 From: DaisukeDaisuke Date: Fri, 26 Feb 2021 19:00:40 +0900 Subject: [PATCH 1/3] fix bug #3(not tested) --- src/kametan0730mc/RunForMoney2/entity/Agent.php | 6 ++---- .../RunForMoney2/entity/LightningBolt.php | 12 ++++++------ .../entity/projectile/DragonFireball.php | 7 +++---- .../RunForMoney2/entity/projectile/FishingHook.php | 7 +++---- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/kametan0730mc/RunForMoney2/entity/Agent.php b/src/kametan0730mc/RunForMoney2/entity/Agent.php index 990e0f2..49d30c6 100755 --- a/src/kametan0730mc/RunForMoney2/entity/Agent.php +++ b/src/kametan0730mc/RunForMoney2/entity/Agent.php @@ -6,14 +6,12 @@ use pocketmine\entity\Entity; +use pocketmine\entity\EntitySizeInfo; use pocketmine\network\mcpe\protocol\types\entity\EntityIds; class Agent extends Entity{ - /* @var float */ - public $width = 0.1; - /* @var float */ - public $height = 0.1; + protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.1, 0.1); } public static function getNetworkTypeId() : string{ return EntityIds::AGENT; } } \ No newline at end of file diff --git a/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php b/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php index af82815..462fe5d 100755 --- a/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php +++ b/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php @@ -6,19 +6,18 @@ use pocketmine\entity\Entity; +use pocketmine\entity\EntitySizeInfo; use pocketmine\entity\Living; use pocketmine\network\mcpe\protocol\types\entity\EntityIds; class LightningBolt extends Entity{ - /* @var float */ - public $width = 0.1; - - /* @var float */ - public $height = 0.1; - /** @var int */ public $age = 0; + protected function getInitialSizeInfo() : EntitySizeInfo{ + return new EntitySizeInfo(0.1, 0.1); + } + public static function getNetworkTypeId(): string{ return EntityIds::LIGHTNING_BOLT; } @@ -30,4 +29,5 @@ protected function entityBaseTick(int $tickDiff = 1): bool{ } return false; } + } \ No newline at end of file diff --git a/src/kametan0730mc/RunForMoney2/entity/projectile/DragonFireball.php b/src/kametan0730mc/RunForMoney2/entity/projectile/DragonFireball.php index 3240632..27abeca 100755 --- a/src/kametan0730mc/RunForMoney2/entity/projectile/DragonFireball.php +++ b/src/kametan0730mc/RunForMoney2/entity/projectile/DragonFireball.php @@ -5,14 +5,13 @@ namespace kametan0730mc\RunForMoney2\entity\projectile; +use pocketmine\entity\EntitySizeInfo; use pocketmine\entity\projectile\Projectile; use pocketmine\network\mcpe\protocol\types\entity\EntityIds; class DragonFireball extends Projectile{ - /* @var float */ - public $width = 0.1; - /* @var float */ - public $height = 0.1; + protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.1, 0.1); } + public static function getNetworkTypeId() : string{ return EntityIds::DRAGON_FIREBALL; } } \ No newline at end of file diff --git a/src/kametan0730mc/RunForMoney2/entity/projectile/FishingHook.php b/src/kametan0730mc/RunForMoney2/entity/projectile/FishingHook.php index 9776527..df7c50d 100755 --- a/src/kametan0730mc/RunForMoney2/entity/projectile/FishingHook.php +++ b/src/kametan0730mc/RunForMoney2/entity/projectile/FishingHook.php @@ -5,14 +5,13 @@ namespace kametan0730mc\RunForMoney2\entity\projectile; +use pocketmine\entity\EntitySizeInfo; use pocketmine\entity\projectile\Projectile; use pocketmine\network\mcpe\protocol\types\entity\EntityIds; class FishingHook extends Projectile{ - /* @var float */ - public $width = 0.1; - /* @var float */ - public $height = 0.1; + protected function getInitialSizeInfo() : EntitySizeInfo{ return new EntitySizeInfo(0.1, 0.1); } + public static function getNetworkTypeId() : string{ return EntityIds::DRAGON_FIREBALL; } } \ No newline at end of file From 182cf451c5dd5bd017b3164ea7defd4d24cf06a9 Mon Sep 17 00:00:00 2001 From: DaisukeDaisuke Date: Fri, 26 Feb 2021 20:08:39 +0900 Subject: [PATCH 2/3] onEnable(){ -> onEnable() : void{ --- src/kametan0730mc/RunForMoney2/Main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kametan0730mc/RunForMoney2/Main.php b/src/kametan0730mc/RunForMoney2/Main.php index 3f5bd17..5c266c1 100755 --- a/src/kametan0730mc/RunForMoney2/Main.php +++ b/src/kametan0730mc/RunForMoney2/Main.php @@ -210,7 +210,7 @@ private function initEnchantment(){ EnchantmentIdMap::getInstance()->register(EnchantmentIds::SHARPNESS, VanillaEnchantments::THORNS()); } - protected function onEnable(){ + protected function onEnable() : void{ date_default_timezone_set("Japan"); $this->getServer()->getWorldManager()->setAutoSave(false); From 8305acf551c07f3adb835d02e950663b0385465b Mon Sep 17 00:00:00 2001 From: DaisukeDaisuke Date: Fri, 26 Feb 2021 20:57:51 +0900 Subject: [PATCH 3/3] oops fix miss --- src/kametan0730mc/RunForMoney2/entity/LightningBolt.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php b/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php index 462fe5d..b6c7c86 100755 --- a/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php +++ b/src/kametan0730mc/RunForMoney2/entity/LightningBolt.php @@ -29,5 +29,4 @@ protected function entityBaseTick(int $tickDiff = 1): bool{ } return false; } - } \ No newline at end of file