From 7e9fb81faa90c73ca7d7c7fbc8789345d9d33da5 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Tue, 5 Jan 2021 16:44:40 +0100 Subject: [PATCH] Fixing Loader String Double Activation --- .../steamwar/bausystem/world/AutoLoader.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java b/BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java index 95a9578..6763ac7 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/AutoLoader.java @@ -165,29 +165,25 @@ public class AutoLoader extends IAutoLoader implements Listener { if (event.getPlayer().isSneaking()) return; - if(!setup || !event.getPlayer().equals(player)) + if (!setup || !event.getPlayer().equals(player)) return; Detoloader detoloader = VersionedCallable.call( - new VersionedCallable<>(() -> - AutoLoader_12.onPlayerInteractLoader(event), 12), - new VersionedCallable<>(() -> - AutoLoader_15.onPlayerInteractLoader(event), 15)); + new VersionedCallable<>(() -> AutoLoader_12.onPlayerInteractLoader(event), 12), + new VersionedCallable<>(() -> AutoLoader_15.onPlayerInteractLoader(event), 15)); - if(detoloader == null || detoloader.getActivation() < 0) - return; + if (detoloader == null || detoloader.getActivation() < 0) return; - if(lastLocation != null && lastLocation.distance(event.getClickedBlock().getLocation()) <= 1) { - return; - } + if (lastLocation != null && lastLocation.distance(event.getClickedBlock().getLocation()) <= 1) return; - if(detoloader.useActive) + if (detoloader.useActive) { new IAutoLoader.RedstoneActivation(this, event.getClickedBlock().getLocation() , detoloader.getActivation() == 0 ? getLastActivation() : detoloader.getActivation() , detoloader.isActive()); - else + } else { new IAutoLoader.TemporaryActivation(this, event.getClickedBlock().getLocation() , detoloader.getActivation()); + } print(detoloader.addBack ? "§e" + detoloader.getBlock() + " betätigt" : detoloader.getBlock(), detoloader.addBack); lastLocation = event.getClickedBlock().getLocation();