From abfe283d9ae9d17c553804269b561043e3982e3d Mon Sep 17 00:00:00 2001 From: alpha Date: Sat, 8 Jun 2024 14:44:31 -0500 Subject: [PATCH] fix: rocket being destroyed on launch --- .../java/dev/galacticraft/mod/content/entity/GCVehicle.java | 2 +- .../galacticraft/mod/content/entity/orbital/RocketEntity.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/galacticraft/mod/content/entity/GCVehicle.java b/src/main/java/dev/galacticraft/mod/content/entity/GCVehicle.java index 0d4121c41..288dc3ebe 100644 --- a/src/main/java/dev/galacticraft/mod/content/entity/GCVehicle.java +++ b/src/main/java/dev/galacticraft/mod/content/entity/GCVehicle.java @@ -94,7 +94,7 @@ public float getMaxDamage() { return 40.0F; } - boolean shouldSourceDestroy(DamageSource source) { + protected boolean shouldSourceDestroy(DamageSource source) { return false; } diff --git a/src/main/java/dev/galacticraft/mod/content/entity/orbital/RocketEntity.java b/src/main/java/dev/galacticraft/mod/content/entity/orbital/RocketEntity.java index 46490f926..9321b9742 100644 --- a/src/main/java/dev/galacticraft/mod/content/entity/orbital/RocketEntity.java +++ b/src/main/java/dev/galacticraft/mod/content/entity/orbital/RocketEntity.java @@ -475,6 +475,7 @@ public void tick() { gcPlayer.setRocketData(this); gcPlayer.setLaunchpadStack(new ItemStack(GCBlocks.ROCKET_LAUNCH_PAD, 9)); } + this.linkedPad.setDockedEntity(null); for (int x = -1; x <= 1; x++) { for (int z = -1; z <= 1; z++) { if (level().getBlockState(getLinkedPad().offset(x, 0, z)).getBlock() == GCBlocks.ROCKET_LAUNCH_PAD