From 2d9c201803d290f5bafcbf34bf7492391482ec5f Mon Sep 17 00:00:00 2001 From: yoyosource Date: Fri, 10 Jun 2022 17:29:24 +0200 Subject: [PATCH] Update loading of TNTElement Signed-off-by: yoyosource --- .../bausystem/features/simulatorn/tnt/TNTElement.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulatorn/tnt/TNTElement.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulatorn/tnt/TNTElement.java index 33130b35..4dd2db42 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulatorn/tnt/TNTElement.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulatorn/tnt/TNTElement.java @@ -75,11 +75,7 @@ public class TNTElement implements SimulatorElement { this.xVelocity = yapionObject.getBooleanOrDefault("xVelocity", false); this.yVelocity = yapionObject.getBooleanOrDefault("yVelocity", false); this.zVelocity = yapionObject.getBooleanOrDefault("zVelocity", false); - if (yapionObject.containsKey("order", Integer.class)) { - this.order = yapionObject.getIntOrDefault("order", 0) == 0 ? Material.REPEATER : Material.COMPARATOR; - } else { - this.order = Material.valueOf(yapionObject.getStringOrDefault("order", yapionObject.getBooleanOrDefault("comparator", false) ? Material.COMPARATOR.name() : Material.REPEATER.name())); - } + this.order = Material.valueOf(yapionObject.getStringOrDefault("order", yapionObject.getBooleanOrDefault("comparator", false) ? Material.COMPARATOR.name() : Material.REPEATER.name())); this.material = Material.valueOf(yapionObject.getStringOrDefault("material", Material.TNT.name())); }