From f62606c7b746c16c305370a37b1f43902a79a55f Mon Sep 17 00:00:00 2001 From: DuckyProgrammer Date: Sat, 14 Sep 2024 19:38:52 -0400 Subject: [PATCH] fix: made the lander explosion happen on the correct celestial body and disabled it creating fire --- .../mod/content/entity/orbital/lander/LanderEntity.java | 2 +- .../mod/content/teleporters/LanderCelestialTeleporterType.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java b/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java index 1420285ea..119aa4f95 100644 --- a/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java +++ b/src/main/java/dev/galacticraft/mod/content/entity/orbital/lander/LanderEntity.java @@ -240,7 +240,7 @@ public void onGroundHit() { entity.setDeltaMovement(Vec3.ZERO); entity.setPos(entity.getX(), this.getY() + 2.25, entity.getZ()); } - this.level().explode(this, this.getX(), this.getY(), this.getZ(), 12, true, Level.ExplosionInteraction.MOB); + this.level().explode(this, this.getX(), this.getY(), this.getZ(), 12, false, Level.ExplosionInteraction.MOB); discard(); } diff --git a/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java b/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java index b27ad181d..1fb782b47 100644 --- a/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java +++ b/src/main/java/dev/galacticraft/mod/content/teleporters/LanderCelestialTeleporterType.java @@ -40,10 +40,10 @@ public LanderCelestialTeleporterType(Codec codec) { @Override public void onEnterAtmosphere(ServerLevel level, ServerPlayer player, CelestialBody body, CelestialBody fromBody, Config config) { + player.teleportTo(level, player.getX(), 1100, player.getZ(), player.getYRot(), player.getXRot()); LanderEntity lander = new LanderEntity(player); level.addFreshEntity(lander); lander.setPos(player.getX(), 1100, player.getZ()); - player.teleportTo(level, player.getX(), 1100, player.getZ(), player.getYRot(), player.getXRot()); player.startRiding(lander, true); } }