From 75b73ff7bb77728248d57bcc50297d980494d68b Mon Sep 17 00:00:00 2001 From: DaisukeDaisuke <17798680+DaisukeDaisuke@users.noreply.github.com> Date: Sun, 1 May 2022 11:30:59 +0900 Subject: [PATCH 1/3] size --- src/brokiem/snpc/entity/npc/BlockingDeadNPC.php | 4 ++-- src/brokiem/snpc/entity/npc/JoinPortal.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php b/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php index 014b4ae..196552d 100644 --- a/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php +++ b/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php @@ -21,8 +21,8 @@ use pocketmine\player\Player; class BlockingDeadNPC extends BaseNPC { - public float $height = 5.0; - public float $width = 5.0; + public float $height = 2.5; + public float $width = 2.5; public int $tick_counter = 0; diff --git a/src/brokiem/snpc/entity/npc/JoinPortal.php b/src/brokiem/snpc/entity/npc/JoinPortal.php index d695e10..a1fc742 100644 --- a/src/brokiem/snpc/entity/npc/JoinPortal.php +++ b/src/brokiem/snpc/entity/npc/JoinPortal.php @@ -10,6 +10,7 @@ namespace brokiem\snpc\entity\npc; use brokiem\snpc\entity\BaseNPC; +use conquest\form\JoinForm; use conquest\object\utils\GameFactory; use entity_factory\CustomEntityIds; use fallendead\level\map; @@ -19,11 +20,10 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\player\Player; use pocketmine\Server; -use conquest\form\JoinForm; class JoinPortal extends BaseNPC { - public float $height = 5.0; - public float $width = 5.0; + public float $height = 2.5; + public float $width = 2.5; protected int $tick_counter = 0; From 84dc639b05f4e9c5ae7bb036e3bc2ad606031184 Mon Sep 17 00:00:00 2001 From: DaisukeDaisuke <17798680+DaisukeDaisuke@users.noreply.github.com> Date: Sun, 1 May 2022 11:54:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=8C6.7=E3=80=8D=E3=82=92=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=83=9C=E3=83=B3=E3=82=B3=E3=83=94=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/brokiem/snpc/entity/npc/JoinPortal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/brokiem/snpc/entity/npc/JoinPortal.php b/src/brokiem/snpc/entity/npc/JoinPortal.php index a1fc742..e34705a 100644 --- a/src/brokiem/snpc/entity/npc/JoinPortal.php +++ b/src/brokiem/snpc/entity/npc/JoinPortal.php @@ -29,7 +29,7 @@ class JoinPortal extends BaseNPC { protected function initEntity(CompoundTag $nbt): void { parent::initEntity($nbt); - $this->setScale(1); + $this->setScale(6.7); } protected function getInitialSizeInfo(): EntitySizeInfo { From aba83de0ed99d8194896eeacb863bd236bf0201f Mon Sep 17 00:00:00 2001 From: DaisukeDaisuke <17798680+DaisukeDaisuke@users.noreply.github.com> Date: Sun, 1 May 2022 12:04:56 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=86=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/brokiem/snpc/entity/npc/BlockingDeadNPC.php | 5 +++-- src/brokiem/snpc/entity/npc/JoinPortal.php | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php b/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php index 196552d..f7763f0 100644 --- a/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php +++ b/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php @@ -10,6 +10,7 @@ namespace brokiem\snpc\entity\npc; use brokiem\snpc\entity\BaseNPC; +use conquest\form\JoinForm; use entity_factory\CustomEntityIds; use fallendead\form\game\JoinFormV2; use fallendead\form\game\SelectMapForm; @@ -22,7 +23,7 @@ class BlockingDeadNPC extends BaseNPC { public float $height = 2.5; - public float $width = 2.5; + public float $width = 0.5; public int $tick_counter = 0; @@ -47,6 +48,6 @@ public function attack(EntityDamageEvent $source) : void{ } private function onJoin(Player $player) : void{ - $player->sendForm(new JoinFormV2()); + $player->sendForm(new JoinForm()); } } diff --git a/src/brokiem/snpc/entity/npc/JoinPortal.php b/src/brokiem/snpc/entity/npc/JoinPortal.php index e34705a..f328f3b 100644 --- a/src/brokiem/snpc/entity/npc/JoinPortal.php +++ b/src/brokiem/snpc/entity/npc/JoinPortal.php @@ -13,6 +13,7 @@ use conquest\form\JoinForm; use conquest\object\utils\GameFactory; use entity_factory\CustomEntityIds; +use fallendead\form\game\JoinFormV2; use fallendead\level\map; use pocketmine\entity\EntitySizeInfo; use pocketmine\event\entity\EntityDamageByEntityEvent; @@ -23,7 +24,7 @@ class JoinPortal extends BaseNPC { public float $height = 2.5; - public float $width = 2.5; + public float $width = 0.5; protected int $tick_counter = 0; @@ -44,8 +45,7 @@ public function attack(EntityDamageEvent $source) : void{ } private function onJoin(Player $player) : void{ - $player->sendForm(new JoinForm()); - + $player->sendForm(new JoinFormV2()); } public static function getNetworkTypeId(): string {