From 3d7dedd3ade66de7245fff3ae4ea6805e0303050 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Wed, 23 Apr 2025 19:13:07 +0200 Subject: [PATCH 1/2] Fix jukeboxes in panzer sklave --- .../de/steamwar/bausystem/features/slaves/panzern/Panzern.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java index 3eca97f4..fc27ff49 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java @@ -25,6 +25,7 @@ import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockTypes; import de.steamwar.bausystem.utils.WorldEditUtils; +import de.steamwar.core.Core; import lombok.Getter; import lombok.SneakyThrows; import org.bukkit.Location; @@ -56,7 +57,7 @@ public class Panzern { private BaseBlock blockType; private BaseBlock slabType; - private static final BaseBlock jukeboxType = BlockTypes.JUKEBOX.getDefaultState().toBaseBlock(); + private static final BaseBlock jukeboxType = Core.getVersion() > 19 ? BlockTypes.get("lodestone").getDefaultState().toBaseBlock() : BlockTypes.get("jukebox").getDefaultState().toBaseBlock(); private static final BaseBlock cobwebType = BlockTypes.COBWEB.getDefaultState().toBaseBlock(); private static final BaseBlock airType = BlockTypes.AIR.getDefaultState().toBaseBlock(); From 239ba3f21335a2e0258cee6a473aff7abb1d4bbf Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Wed, 23 Apr 2025 19:14:44 +0200 Subject: [PATCH 2/2] made more readable --- .../de/steamwar/bausystem/features/slaves/panzern/Panzern.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java index fc27ff49..2823beb0 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/panzern/Panzern.java @@ -57,7 +57,7 @@ public class Panzern { private BaseBlock blockType; private BaseBlock slabType; - private static final BaseBlock jukeboxType = Core.getVersion() > 19 ? BlockTypes.get("lodestone").getDefaultState().toBaseBlock() : BlockTypes.get("jukebox").getDefaultState().toBaseBlock(); + private static final BaseBlock jukeboxType = (Core.getVersion() > 19 ? BlockTypes.get("lodestone"): BlockTypes.get("jukebox")).getDefaultState().toBaseBlock(); private static final BaseBlock cobwebType = BlockTypes.COBWEB.getDefaultState().toBaseBlock(); private static final BaseBlock airType = BlockTypes.AIR.getDefaultState().toBaseBlock();