diff --git a/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php b/src/brokiem/snpc/entity/npc/BlockingDeadNPC.php index 014b4ae..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; @@ -21,8 +22,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 = 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 d695e10..f328f3b 100644 --- a/src/brokiem/snpc/entity/npc/JoinPortal.php +++ b/src/brokiem/snpc/entity/npc/JoinPortal.php @@ -10,8 +10,10 @@ 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\form\game\JoinFormV2; use fallendead\level\map; use pocketmine\entity\EntitySizeInfo; use pocketmine\event\entity\EntityDamageByEntityEvent; @@ -19,17 +21,16 @@ 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 = 0.5; protected int $tick_counter = 0; protected function initEntity(CompoundTag $nbt): void { parent::initEntity($nbt); - $this->setScale(1); + $this->setScale(6.7); } protected function getInitialSizeInfo(): EntitySizeInfo { @@ -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 {