Fix messages for clear command

Fix DevServer kicking every member not added
Fix WarpListener for 1.20+

BauSystem_Main/src/BauSystem.properties

@@ -48,6 +48,8 @@ FLAG_FIRE=Fire
 FLAG_FREEZE=Freeze
 FLAG_PROTECT=Protect
 FLAG_ITEMS=Items
+FLAG_TESTBLOCK=Testblock
+FLAG_CHANGED=Changed
 FLAG_FIRE_ALLOW=§con
 FLAG_FIRE_DENY=§aoff
 FLAG_FREEZE_ACTIVE=§aon
@@ -78,6 +80,11 @@ FLAG_COLOR_BROWN=§eBrown
 FLAG_COLOR_GREEN=§2Green
 FLAG_COLOR_RED=§cRed
 FLAG_COLOR_BLACK=§0Black
+FLAG_TESTBLOCK_NO_VALUE=§eNo Value
+FLAG_TESTBLOCK_NORTH=§eNorth
+FLAG_TESTBLOCK_SOUTH=§eSouth
+FLAG_CHANGED_NO_CHANGE=§cNo
+FLAG_CHANGED_HAS_CHANGE=§aYes
 # Region
 REGION_TYPE_NORMAL=Normal
 REGION_TYPE_BUILD=Build area
@@ -437,8 +444,8 @@ TRACE_MESSAGE_SHOW_FROM_TO=§aAll TNT-positions shown from {0} to {1}
 TRACE_MESSAGE_SHOW_TO_SMALLER=§cTo must be bigger then from
 TRACE_MESSAGE_CLICK_ISOLATE=§eClick to §aisolate§8/§cunisolate
 TRACE_MESSAGE_ISOLATE=§eTNT Positions have been isolated
-TRACE_MESSAGE_SHARE=§e{0} shared his trace show state.
-TRACE_MESSAGE_SHARE_HOVER=§eClick to view
+TRACE_MESSAGE_BROADCAST=§e{0} shared his trace show state.
+TRACE_MESSAGE_BROADCAST_HOVER=§eClick to view
 TRACE_MESSAGE_FOLLOW=§aYou are now following {0} Trace show state
 TRACE_MESSAGE_FOLLOW_SELF=§cYou cannot follow yourself!
 TRACE_MESSAGE_UNFOLLOW=§cYou are no longer following a Trace show state
@@ -455,7 +462,7 @@ TRACE_COMMAND_HELP_SHOW_FROM_TO_WITH=§8/§etrace show §7from §8<§eFROM§8>
 TRACE_COMMAND_HELP_HIDE=§8/§etrace hide §8- §7Hides all TNT-positions
 TRACE_COMMAND_HELP_DELETE=§8/§etrace delete §8[§eTrace§8] §8- §7Deletes all TNT-positions or a Trace
 TRACE_COMMAND_HELP_ISOLATE=§8/§etrace isolate §8[§eTrace§8] §8[§eTNT§8] §8- §7Isolates specific TNTs from the Trace
-TRACE_COMMAND_HELP_SHARE=§8/§etrace share §8- §7Share your current Trace show state with others
+TRACE_COMMAND_HELP_BROADCAST=§8/§etrace broadcast §8- §7Share your current Trace show state with others
 TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Follow a players Trace show state
 TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Unfollow the Trace show state
 TRACE_GUI_ITEM_NAME=§eTracer
@@ -620,9 +627,9 @@ OTHER_NOCLIP_SLOT_HELP_PICK=§8/§eslot pick §8-§7 Take the faced block into y
 OTHER_NOCLIP_SLOT_HELP_DROP=§8/§eslot drop §8-§7 Clears your slot
 OTHER_CLEAR_HELP_SELF=§8/§eclear §8- §7Clears your inventory
 OTHER_CLEAR_HELP_PLAYER=§8/§eclear §8[§7Player§8] §8- §7Clears a player inventory
-OTHER_CLEAR_CLEARED=Your inventory was cleared.
-OTHER_CLEAR_FROM=Your invetnory was cleared by {0}.
-OTHER_CLEAR_TO=The inventory of {0} §7was cleared.
+OTHER_CLEAR_CLEARED=§7Your inventory was cleared.
+OTHER_CLEAR_FROM=§7Your invetnory was cleared by {0}.
+OTHER_CLEAR_TO=§7The inventory of {0} §7was cleared.
 OTHER_DECLUTTER_HELP=§8/§edeclutter §8- §7Organise your inventory
 OTHER_DECLUTTER_DONE=§aYour inventory was organised.
 OTHER_GAMEMODE_UNKNOWN=§cUnknown gamemode.
@@ -971,7 +978,7 @@ WARP_GUI_NAME=Warps
 WARP_GUI_NO=§cNo warps exist
 WARP_GUI_DISTANCE=§7Distance: §e{0} §7blocks
 WARP_GUI_LCLICK=§7Left click to teleport
-WARP_GUI_RCLICK=§7Rickt click to edit
+WARP_GUI_RCLICK=§7Right click to edit
 WARP_INFO_NAME=§7Name: §e{0}
 WARP_HELP_ADD=§8/§ewarp add §8[§7name§8] §8- §7Create a new warp
 WARP_HELP_TELEPORT=§8/§ewarp §8[§7name§8] §8- §7Teleport to a warp
@@ -995,6 +1002,6 @@ XRAY_ON=§aXray activated
 XRAY_OFF=§cXray deactivated
 # WorldEdit
 COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §7Replace all blocks of one color with another
-TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
+TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
 # Schematic
 SCHEMATIC_GUI_ITEM=§eSchematics

BauSystem_Main/src/BauSystem_de.properties

@@ -402,14 +402,14 @@ TRACE_MESSAGE_CLICK_ISOLATE=§eKlicken zum §aisolieren§8/§causblenden
 TRACE_MESSAGE_SHOW_AT=§aTNT-positions angezeigt bei {0}
 TRACE_MESSAGE_SHOW_FROM=§aAll TNT-positions angezeigt von {0}
 TRACE_MESSAGE_SHOW_FROM_TO=§aAll TNT-positions angezeigt von {0} bis {1}
-TRACE_MESSAGE_SHARE=§e{0} teilte seinen Trace-Show-Status.
-TRACE_MESSAGE_SHARE_HOVER=§eZum Ansehen klicken.
+TRACE_MESSAGE_BROADCAST=§e{0} teilte seinen Trace-Show-Status.
+TRACE_MESSAGE_BROADCAST_HOVER=§eZum Ansehen klicken.
 TRACE_MESSAGE_FOLLOW=§aSie folgen nun {0} Trace show state
 TRACE_MESSAGE_FOLLOW_SELF=§cSie können sich selbst nicht folgen!
 TRACE_MESSAGE_UNFOLLOW=§cSie folgen nicht mehr dem Status einer Trace-Show
 TRACE_MESSAGE_SHOW_TO_SMALLER=§cBis muss größer als von sein
 TRACE_MESSAGE_ISOLATE=§eTNT Positionen wurden isoliert
-TRACE_COMMAND_HELP_SHARE=§8/§etrace share §8- §7Teilt den aktuellen Trace-Show-Status mit anderen
+TRACE_COMMAND_HELP_BROADCAST=§8/§etrace broadcast §8- §7Teilt den aktuellen Trace-Show-Status mit anderen
 TRACE_COMMAND_HELP_FOLLOW=§8/§etrace follow §8[§ePlayer§8] §8- §7Verfolgen eines Spielers Status anzeigen
 TRACE_COMMAND_HELP_UNFOLLOW=§8/§etrace unfollow §8- §7Den Status der Trace-Anzeige aufheben
 TRACE_COMMAND_HELP_START=§8/§etrace start §8- §7Startet die Aufnahme aller TNT-Positionen
@@ -582,9 +582,9 @@ OTHER_NOCLIP_SLOT_HELP_PICK=§8/§eslot pick §8-§7 Lege den angeguckten Block
 OTHER_NOCLIP_SLOT_HELP_DROP=§8/§eslot drop §8-§7 Cleared deinen Slot
 OTHER_CLEAR_HELP_SELF=§8/§eclear §8- §7Leere dein Inventar
 OTHER_CLEAR_HELP_PLAYER=§8/§eclear §8[§7Player§8] §8- §7Leere ein Spieler Inventar
-OTHER_CLEAR_CLEARED=Dein Inventar wurde geleert.
-OTHER_CLEAR_FROM=Dein Inventar wurde von {0} §7geleert.
-OTHER_CLEAR_TO=Das Inventar von {0} §7wurde geleert.
+OTHER_CLEAR_CLEARED=§7Dein Inventar wurde geleert.
+OTHER_CLEAR_FROM=§7Dein Inventar wurde von {0} §7geleert.
+OTHER_CLEAR_TO=§7Das Inventar von {0} §7wurde geleert.
 OTHER_DECLUTTER_HELP=§8/§edeclutter §8- §7Räume dein Inventar auf
 OTHER_DECLUTTER_DONE=§aDein Inventar wurde aufgeräumt.
 OTHER_GAMEMODE_UNKNOWN=§cUnbekannter Spielmodus.

BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java

@@ -52,6 +52,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     // This should be treated as final!
     public static Message MESSAGE;
+    public static final boolean DEV_SERVER = !System.getProperty("user.home").endsWith("minecraft");
 
     @Getter
     private static BauSystem instance;
@@ -72,6 +73,7 @@ public class BauSystem extends JavaPlugin implements Listener {
         } catch (SecurityException e) {
             Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
             Bukkit.shutdown();
+            System.exit(1);
             return;
         }
 
@@ -83,7 +85,14 @@ public class BauSystem extends JavaPlugin implements Listener {
         SWCommandUtils.addValidator("supervisor", validator(Permission.SUPERVISOR));
         SWCommandUtils.addValidator("owner", validator(Permission.OWNER));
 
-        LinkageUtils.link();
+        try {
+            LinkageUtils.link();
+        } catch (Exception e) {
+            Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
+            Bukkit.shutdown();
+            System.exit(1);
+            return;
+        }
         TickListener.impl.init();
     }
 

BauSystem_Main/src/de/steamwar/bausystem/features/design/endstone/DesignEndStone.java

@@ -44,6 +44,8 @@ public class DesignEndStone {
     private REntityServer entityServer = new REntityServer();
     private List<REntity> entities = new ArrayList<>();
     private Set<Location> locations = new HashSet<>();
+    private boolean wsOrAs;
+    private double maxBlastResistance;
 
     public DesignEndStone(Region region) {
         this.minX = region.getMinPointBuild().getX();
@@ -52,6 +54,17 @@ public class DesignEndStone {
         this.maxX = region.getMaxPointBuild().getX();
         this.maxY = region.getMaxPointBuild().getY();
         this.maxZ = region.getMaxPointBuild().getZ();
+        wsOrAs = region.getName().startsWith("ws") || region.getName().startsWith("as");
+        maxBlastResistance = wsOrAs ? 6.1 : 9.0;
+
+        entityServer.setCallback((player, rEntity, entityAction) -> {
+            if (entityAction != REntityServer.EntityAction.ATTACK) return;
+            Location location = new Location(WORLD, rEntity.getX(), rEntity.getY(), rEntity.getZ());
+            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                location.getBlock().breakNaturally();
+                calc();
+            }, 1);
+        });
     }
 
     public void calc() {
@@ -63,8 +76,24 @@ public class DesignEndStone {
         calc(minX, minY, maxZ, maxX, maxY, maxZ, 0, 0, -1, maxZ - minZ);
         calc(minX, minY, minZ, minX, maxY, maxZ, 1, 0, 0, maxX - minX);
         calc(maxX, minY, minZ, maxX, maxY, maxZ, -1, 0, 0, maxX - minX);
-        // calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY);
-        calc(minX, maxY, minZ, maxX, maxY, maxZ, 0, -1, 0, maxY - minY);
+        if (wsOrAs) {
+            calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
+        } else {
+            int airBlocks = 0;
+            double minAirBlocks = (maxX - minX) * (maxZ - minZ) * 0.1;
+            for (int x = minX; x < maxX; x++) {
+                for (int z = minZ; z < maxZ; z++) {
+                    if (WORLD.getBlockAt(x, minY, z).getType().isAir()) {
+                        airBlocks++;
+                        if (airBlocks > minAirBlocks) break;
+                    }
+                }
+            }
+            if (airBlocks > minAirBlocks) {
+                calc(minX, minY, minZ, maxX, minY, maxZ, 0, 1, 0, maxY - minY + 1);
+            }
+        }
+        calc(minX, maxY, minZ, maxX, maxY, maxZ, 0, -1, 0, maxY - minY + 1);
     }
 
     private void calc(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dirX, int dirY, int dirZ, int steps) {
@@ -76,15 +105,16 @@ public class DesignEndStone {
                         int cy = y + step * dirY;
                         int cz = z + step * dirZ;
                         Material material = WORLD.getBlockAt(cx, cy, cz).getType();
-                        if (material == Material.END_STONE || material == Material.END_STONE_BRICKS || material == Material.END_STONE_BRICK_SLAB || material == Material.END_STONE_BRICK_STAIRS || material == Material.END_STONE_BRICK_WALL) {
+
+                        if (material != Material.WATER && material != Material.LAVA && material.getBlastResistance() >= maxBlastResistance) {
                             Location location = new Location(WORLD, cx + 0.5, cy, cz + 0.5);
-                            if (locations.contains(location)) break;
+                            if (!locations.add(location)) break;
                             RFallingBlockEntity entity = new RFallingBlockEntity(entityServer, location, Material.RED_STAINED_GLASS);
                             entity.setNoGravity(true);
                             entity.setGlowing(true);
                             entities.add(entity);
                             break;
-                        } else if (!material.isAir()) {
+                        } else if (!material.isAir() && material != Material.WATER && material != Material.LAVA) {
                             break;
                         }
                     }

BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java

@@ -90,11 +90,10 @@ public class ProcessingTracesState implements LaufbauState {
 
         Location location = current.getLocation();
         if (current.getPrevious().isPresent()) {
-            Vector velocity = current.getPrevious().get().getVelocity();
             Location previousLocation = current.getPrevious().get().getLocation();
             Location movement = location.clone().subtract(previousLocation);
             calculateCuboid(new Cuboid(previousLocation.getX() - 0.49, Math.min(previousLocation.getY(), location.getY()), previousLocation.getZ() - 0.49, 0.98, Math.abs(movement.getY()) + 0.98, 0.98));
-            if (velocity.getX() >= velocity.getZ()) {
+            if (movement.getX() >= movement.getZ()) {
                 calculateCuboid(new Cuboid(Math.min(previousLocation.getX(), location.getX()) - 0.49, location.getY(), previousLocation.getZ() - 0.49, Math.abs(movement.getX()) + 0.98, 0.98, 0.98));
                 calculateCuboid(new Cuboid(location.getX() - 0.49, location.getY(), Math.min(previousLocation.getZ(), location.getZ()) - 0.49, 0.98, 0.98, Math.abs(movement.getZ()) + 0.98));
             } else {

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java

@@ -219,6 +219,9 @@ public class TNTPoint implements Externalizable {
     public boolean equals(Object obj) {
         if (!(obj instanceof TNTPoint)) return false;
         TNTPoint record = (TNTPoint) obj;
+        if (record.getTntId() != tntId) return false;
+        if (record.getFuse() != fuse) return false;
+        if (record.getTicksSinceStart() != ticksSinceStart) return false;
         if (record.isExplosion() != explosion) return false;
         if (!record.getLocation().equals(location)) return false;
         if (!record.getVelocity().equals(velocity)) return false;

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java

@@ -29,11 +29,14 @@ import de.steamwar.entity.REntityServer;
 import lombok.Cleanup;
 import lombok.Getter;
 import lombok.SneakyThrows;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import java.io.*;
 import java.lang.ref.SoftReference;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.GZIPInputStream;
@@ -188,7 +191,19 @@ public class Trace {
      * @param playerTraceShowData The showData for modifying the rendering
      */
     protected void render(List<TNTPoint> records, Player player, PlayerTraceShowData playerTraceShowData) {
-        render(records, entityServerMap.get(player), playerTraceShowData);
+        REntityServer entityServer = entityServerMap.computeIfAbsent(player, k -> {
+            REntityServer newEntityServer = new REntityServer();
+            newEntityServer.addPlayer(k);
+            newEntityServer.setCallback((p, rEntity, entityAction) -> {
+                if (entityAction != REntityServer.EntityAction.INTERACT) return;
+                if (rEntity instanceof TraceEntity) {
+                    ((TraceEntity) rEntity).printIntoChat(p);
+                }
+            });
+            return newEntityServer;
+        });
+
+        render(records, entityServer, playerTraceShowData);
     }
 
     /**
@@ -296,16 +311,28 @@ public class Trace {
     /**
      * Loads the records of this trace from storage to memory
      */
-    @SneakyThrows
     private void loadRecords() {
         List<TNTPoint> records = new ArrayList<>();
+        long readBytes = 0;
+        try {
+            FileInputStream fileInputStream = new FileInputStream(recordsSaveFile);
 
-        FileInputStream fileInputStream = new FileInputStream(recordsSaveFile);
+            @Cleanup
+            ObjectInputStream inputStream = new ObjectInputStream(new GZIPInputStream(fileInputStream));
+            long fileLenght = recordsSaveFile.length();
+            while (fileInputStream.getChannel().position() < fileLenght) {
+                records.add((TNTPoint) inputStream.readObject());
+                readBytes = fileInputStream.getChannel().position();
+            }
+        } catch (EOFException e) {
+            Logger logger = Bukkit.getLogger();
+            logger.log(Level.WARNING, "EOF in trace read detected in " + uuid);
+            logger.log(Level.WARNING, "Read " + readBytes + "/" + recordsSaveFile.length() + " Bytes");
+            logger.log(Level.WARNING, "Read so far: " + records);
 
-        @Cleanup
-        ObjectInputStream inputStream = new ObjectInputStream(new GZIPInputStream(fileInputStream));
-        while (fileInputStream.getChannel().position() < recordsSaveFile.length()) {
-            records.add((TNTPoint) inputStream.readObject());
+            e.printStackTrace();
+        } catch (IOException | ClassNotFoundException e) {
+            e.printStackTrace();
         }
 
         Map<Integer, List<TNTPoint>> histories = new HashMap<>();
@@ -319,7 +346,7 @@ public class Trace {
         this.records = new SoftReference<>(records);
     }
 
-    public List<TNTPoint> getRecords() {
+    public synchronized List<TNTPoint> getRecords() {
         if (records.get() == null) {
             loadRecords();
         }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java

@@ -57,17 +57,21 @@ public class TraceCommand extends SWCommand {
     public void stop(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
         TraceRecorder.instance.stopRecording(region);
-        BauSystem.MESSAGE.send("TRACE_MESSAGE_STOP", player);
+
+
+        if (TraceRecorder.instance.isAutoTraceEnabledInRegion(region)) {
+            TraceRecorder.instance.removeAutoTraceRegion(region);
+            BauSystem.MESSAGE.send("TRACE_MESSAGE_AUTO_STOP", player);
+        } else {
+            BauSystem.MESSAGE.send("TRACE_MESSAGE_STOP", player);
+        }
     }
 
     @Register(value = "auto", description = "TRACE_COMMAND_HELP_AUTO")
     public void auto(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (TraceRecorder.instance.toggleAutoTrace(region)) {
-            BauSystem.MESSAGE.send("TRACE_MESSAGE_AUTO_START", player);
-        } else {
-            BauSystem.MESSAGE.send("TRACE_MESSAGE_AUTO_STOP", player);
-        }
+        TraceRecorder.instance.addAutoTraceRegion(region);
+        BauSystem.MESSAGE.send("TRACE_MESSAGE_AUTO_START", player);
     }
 
     @Register(value = "show", description = "TRACE_COMMAND_HELP_SHOW")
@@ -134,6 +138,7 @@ public class TraceCommand extends SWCommand {
         BauSystem.MESSAGE.send("TRACE_MESSAGE_HIDE", player);
     }
 
+    @Register(value = "delete")
     @Register(value = "clear")
     public void clear(@Validator Player player) {
         TraceManager.instance.clear(Region.getRegion(player.getLocation()));
@@ -152,9 +157,9 @@ public class TraceCommand extends SWCommand {
         BauSystem.MESSAGE.send("TRACE_MESSAGE_ISOLATE", player);
     }
 
-    @Register(value = "share", description = "TRACE_COMMAND_HELP_SHARE")
-    public void share(@Validator Player player) {
-        BauSystem.MESSAGE.broadcast("TRACE_MESSAGE_SHARE", "TRACE_MESSAGE_SHARE_HOVER", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace follow " + player.getName()), player.getName());
+    @Register(value = "broadcast", description = "TRACE_COMMAND_HELP_BROADCAST")
+    public void broadcast(@Validator Player player) {
+        BauSystem.MESSAGE.broadcast("TRACE_MESSAGE_BROADCAST", "TRACE_MESSAGE_BROADCAST_HOVER", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace follow " + player.getName()), player.getName());
     }
 
     @Register(value = "follow", description = "TRACE_COMMAND_HELP_FOLLOW")
@@ -247,7 +252,7 @@ public class TraceCommand extends SWCommand {
             @Override
             public ViewFlag map(CommandSender commandSender, String[] previousArguments, String s) {
                 for (ViewFlag flag : ViewFlag.flags) {
-                    if (s.equals("--" + flag.name)) {
+                    if (s.equals("-" + flag.name)) {
                         return flag;
                     }
 
@@ -263,7 +268,7 @@ public class TraceCommand extends SWCommand {
             @Override
             public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 return ViewFlag.flags.stream()
-                        .flatMap(viewFlag -> Stream.concat(Stream.of("--" + viewFlag.name),
+                        .flatMap(viewFlag -> Stream.concat(Stream.of("-" + viewFlag.name),
                                 Arrays.stream(viewFlag.aliases).map(name -> "-" + name)))
                         .collect(Collectors.toList());
             }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java

@@ -152,7 +152,7 @@ public class TraceManager implements Listener {
                 .keySet()
                 .forEach(player -> {
                     Set<Player> players = followerMap.getOrDefault(player, Collections.emptySet());
-                    tracesByRegion.get(region).values().forEach(trace -> {
+                    tracesByRegion.getOrDefault(region, new HashMap<>()).values().forEach(trace -> {
                         trace.hide(player);
                         players.forEach(trace::hide);
                     });

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java

@@ -74,18 +74,12 @@ public class TraceRecorder implements Listener {
         }, 0, 1);
     }
 
-    /**
-     * Toggles auto trace for the given region
-     *
-     * @param region
-     */
-    public boolean toggleAutoTrace(Region region) {
-        if (!autoTraceRegions.remove(region)) {
-            autoTraceRegions.add(region);
-            return true;
-        } else {
-            return false;
-        }
+    public void addAutoTraceRegion(Region region) {
+        autoTraceRegions.add(region);
+    }
+
+    public void removeAutoTraceRegion(Region region) {
+        autoTraceRegions.remove(region);
     }
 
     /**
@@ -104,14 +98,11 @@ public class TraceRecorder implements Listener {
      *
      * @param region region to be recorded
      */
-    public int startRecording(Region region) {
-        if (activeTraces.containsKey(region)) {
-            return -1;
-        }
+    public void startRecording(Region region) {
+        if (activeTraces.containsKey(region)) return;
 
         TraceRecordingWrapper wrappedTrace = new TraceRecordingWrapper(region);
         activeTraces.put(region, wrappedTrace);
-        return TraceManager.instance.add(wrappedTrace.getTrace());
     }
 
     /**
@@ -124,7 +115,6 @@ public class TraceRecorder implements Listener {
         if (wrappedTrace == null) return;
 
         wrappedTrace.finalizeRecording();
-
         activeTraces.remove(region);
         for (TNTPrimed tnt : trackedTNT.getOrDefault(region, Collections.emptyList())) {
             historyMap.remove(tnt);
@@ -138,9 +128,19 @@ public class TraceRecorder implements Listener {
     private void record() {
         for (Region region : activeTraces.keySet()) {
             TraceRecordingWrapper wrappedTrace = activeTraces.get(region);
-            for (TNTPrimed tnt : trackedTNT.getOrDefault(region, Collections.emptyList())) {
+            Iterator<TNTPrimed> iter = trackedTNT.getOrDefault(region, Collections.emptyList()).iterator();
+            while (iter.hasNext()) {
+                TNTPrimed tnt = iter.next();
+                if (tnt.getFuseTicks() == 80) continue;
                 TNTPoint record = record(tnt, wrappedTrace, Collections.emptyList());
-                wrappedTrace.addRecord(record);
+                if (record == null) {
+                    iter.remove();
+                    tntSpawnRegion.remove(tnt);
+                    historyMap.remove(tnt);
+                    tntSpawnRegion.remove(tnt);
+                } else {
+                    wrappedTrace.addRecord(record);
+                }
             }
             wrappedTrace.commitRecorded();
         }
@@ -156,6 +156,12 @@ public class TraceRecorder implements Listener {
      */
     private TNTPoint record(TNTPrimed tntPrimed, TraceRecordingWrapper wrappedTrace, List<Block> destroyedBlocks) {
         List<TNTPoint> history = historyMap.getOrDefault(tntPrimed, new ArrayList<>());
+
+        // Failsave for tnt entering unloaded chunks
+        if (tntPrimed.isDead() || history.size() > 0 && history.get(history.size() - 1).getFuse() == tntPrimed.getFuseTicks()) {
+            return null;
+        }
+
         int tntID;
 
         if (history.size() == 0) {
@@ -171,7 +177,7 @@ public class TraceRecorder implements Listener {
         }
         boolean afterFirstExplosion = wrappedTrace.isExplosionRecorded();
 
-        TNTPoint record = new TNTPoint(tntID, tntPrimed, isExplosion, afterFirstExplosion, TPSUtils.currentTick.get() - wrappedTrace.getStartTick(), history, destroyedBlocks);
+        TNTPoint record = new TNTPoint(tntID, tntPrimed, isExplosion, afterFirstExplosion, TPSUtils.currentRealTick.get() - wrappedTrace.getStartTick(), history, destroyedBlocks);
         history.add(record);
 
         return record;
@@ -185,6 +191,22 @@ public class TraceRecorder implements Listener {
         return activeTraces.containsKey(region);
     }
 
+    /**
+     * Get the trace that is currently recorded in the given region
+     *
+     * @param region the region to get the trace for
+     * @return the trace recorded in region or empty if no trace is recorded in region
+     */
+    public Optional<Trace> getActiveTraceForRegion(Region region) {
+        TraceRecordingWrapper traceWrapper = activeTraces.get(region);
+
+        if (traceWrapper == null) {
+            return Optional.empty();
+        } else {
+            return Optional.of(traceWrapper.getTrace());
+        }
+    }
+
     public long getStartTimeOfTraceInRegion(Region region) {
         TraceRecordingWrapper wrapper = activeTraces.get(region);
         if (wrapper == null) return 0;
@@ -225,15 +247,16 @@ public class TraceRecorder implements Listener {
      *
      * @param event
      */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onTNTExplode(EntityExplodeEvent event) {
         if (!(event.getEntity() instanceof TNTPrimed)) return;
-
         Region region = tntSpawnRegion.getOrDefault((TNTPrimed) event.getEntity(), null);
         if (region == null) return;
         trackedTNT.get(region).remove((TNTPrimed) event.getEntity());
         tntSpawnRegion.remove((TNTPrimed) event.getEntity());
 
         activeTraces.get(region).addRecord(record((TNTPrimed) event.getEntity(), activeTraces.get(region), event.blockList()));
+        tntSpawnRegion.remove((TNTPrimed) event.getEntity());
+        historyMap.remove((TNTPrimed) event.getEntity());
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java

@@ -53,7 +53,6 @@ public class TraceRecordingWrapper {
         recordList = new ArrayList<>();
 
         trace = new Trace(region, recordList);
-        TraceManager.instance.add(trace);
         File recordsSaveFile = new File(TraceManager.tracesFolder, trace.getUuid() + ".records");
         recordsOutputStream = new ObjectOutputStream(new GZIPOutputStream(new FileOutputStream(recordsSaveFile)));
     }
@@ -90,9 +89,6 @@ public class TraceRecordingWrapper {
     protected void finalizeRecording() {
         recordsOutputStream.flush();
         recordsOutputStream.close();
-
-        if (trace.getRecords().isEmpty()) {
-            TraceManager.instance.remove(trace);
-        }
+        TraceManager.instance.add(trace);
     }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/TraceEntity.java

@@ -19,20 +19,16 @@
 
 package de.steamwar.bausystem.features.tracer.rendering;
 
-import com.comphenix.tinyprotocol.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tracer.TNTPoint;
 import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceManager;
-import de.steamwar.core.Core;
-import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
-import de.steamwar.techhider.BlockIds;
+import de.steamwar.entity.RFallingBlockEntity;
 import lombok.Getter;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -41,9 +37,7 @@ import java.util.stream.Collectors;
 /**
  * Wrapper for the rendering of a record bundle
  */
-public class TraceEntity extends REntity {
-
-    private static final Reflection.MethodInvoker addEntityMethod = Reflection.getMethod(REntityServer.class, "addEntity", REntity.class);
+public class TraceEntity extends RFallingBlockEntity {
 
     /**
      * The records represented by this REntity
@@ -59,12 +53,11 @@ public class TraceEntity extends REntity {
     private final Trace trace;
 
     public TraceEntity(REntityServer server, Location location, boolean isExplosion, List<TNTPoint> records, Trace trace) {
-        super(server, EntityType.FALLING_BLOCK, location, BlockIds.impl.materialToId(isExplosion ? Material.RED_STAINED_GLASS : Material.TNT) >> (Core.getVersion() <= 12 ? 4 : 0));
-        setNoGravity(true);
+        super(server, location, isExplosion ? Material.RED_STAINED_GLASS : Material.TNT);
         this.records = records;
-        uniqueTntIdsString = records.stream().map(TNTPoint::getTntId).distinct().map(Object::toString).collect(Collectors.joining(" "));
         this.trace = trace;
-        addEntityMethod.invoke(server, this);
+        uniqueTntIdsString = records.stream().map(TNTPoint::getTntId).distinct().map(Object::toString).collect(Collectors.joining(" "));
+        setNoGravity(true);
     }
 
     /**
@@ -85,11 +78,4 @@ public class TraceEntity extends REntity {
         BauSystem.MESSAGE.sendPrefixless("TNT_CLICK_VELOCITY_Z", player, representative.getVelocity().getZ() + "");
         BauSystem.MESSAGE.sendPrefixless("TNT_CLICK_ISOLATE", player, BauSystem.MESSAGE.parse("TRACE_MESSAGE_CLICK_ISOLATE", player), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace isolate " + TraceManager.instance.getId(trace) + " " + uniqueTntIdsString));
     }
-
-    @Override
-    public boolean equals(Object object) {
-        if (!(object instanceof TraceEntity)) return false;
-        TraceEntity entity = (TraceEntity) object;
-        return records.get(0).equals(entity.getRecords().get(0));
-    }
 }

BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/ViewFlag.java

@@ -26,10 +26,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.util.Vector;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -120,26 +117,30 @@ public abstract class ViewFlag {
         @Override
         public void modify(REntityServer server, List<TraceEntity> entities) {
             for (TraceEntity entity : entities) {
-                TNTPoint current = entity.getRecords().get(0);
-                if (current.isExplosion()) continue;
-                TNTPoint next = current.getNext().orElse(null);
-                if (next == null) continue;
+                TNTPoint representative = entity.getRecords().get(0);
+                Optional<TNTPoint> prev = representative.getPrevious();
 
-                Location pos = current.getLocation().clone();
-                pos.setY(next.getLocation().getY());
+                if (prev.isEmpty()) continue;
 
-                if (pos.distanceSquared(current.getLocation()) >= 1.0 / 256.0) {
-                    RFallingBlockEntity y = new RFallingBlockEntity(server, pos, Material.WHITE_STAINED_GLASS);
+                TNTPoint previous = prev.get();
+
+                Location delta = representative.getLocation().clone().subtract(previous.getLocation());
+
+                Location yLocation = previous.getLocation().clone().add(0, delta.getY(), 0);
+                if (yLocation.distanceSquared(representative.getLocation()) >= 1.0 / 256.0 && yLocation.distanceSquared(previous.getLocation()) >= 1.0 / 256.0) {
+                    RFallingBlockEntity y = new RFallingBlockEntity(server, yLocation, Material.WHITE_STAINED_GLASS);
                     y.setNoGravity(true);
                 }
 
-                if (current.getVelocity().getX() >= current.getVelocity().getZ()) {
-                    pos.setX(next.getLocation().getX());
+                Location secoundLocation;
+                if (delta.getX() >= delta.getZ()) {
+                    secoundLocation = previous.getLocation().clone().add(delta.getX(), delta.getY(), 0);
                 } else {
-                    pos.setZ(next.getLocation().getZ());
+                    secoundLocation = previous.getLocation().clone().add(0, delta.getY(), delta.getZ());
                 }
-                if (pos.distanceSquared(next.getLocation()) >= 1.0 / 256.0) {
-                    RFallingBlockEntity second = new RFallingBlockEntity(server, pos, Material.WHITE_STAINED_GLASS);
+
+                if (secoundLocation.distanceSquared(representative.getLocation()) >= 1.0 / 256.0 && secoundLocation.distanceSquared(previous.getLocation()) >= 1.0 / 256.0) {
+                    RFallingBlockEntity second = new RFallingBlockEntity(server, secoundLocation, Material.WHITE_STAINED_GLASS);
                     second.setNoGravity(true);
                 }
             }

BauSystem_Main/src/de/steamwar/bausystem/features/warp/WarpListener.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.warp;
 
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.core.Core;
 import de.steamwar.entity.RArmorStand;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.linkage.Linked;
@@ -107,9 +108,9 @@ public class WarpListener implements Listener {
             vector.setY(0);
 
             Vector position = p.getLocation().toVector().clone().add(vector.normalize().multiply(5));
-            position.setY(p.getLocation().getY() - 1);
+            position.setY(p.getLocation().getY() - (Core.getVersion() >= 20 ? 0 : 1));
 
-            if (position.distanceSquared(current) < 0.1) {
+            if ((position.getX() - current.getX()) * (position.getX() - current.getX()) + (position.getZ() - current.getZ()) * (position.getZ() - current.getZ()) < 0.1) {
                 name = "§a§l" + name;
                 selected.computeIfAbsent(p, player -> new ArrayList<>()).add(location);
             }

BauSystem_Main/src/de/steamwar/bausystem/features/world/AntiBauAddMemberFix.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.bausystem.features.world;
 
+import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.BauweltMember;
@@ -34,6 +35,7 @@ public class AntiBauAddMemberFix implements Listener {
 
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerJoin(PlayerJoinEvent event) {
+        if (BauSystem.DEV_SERVER) return;
         if (event.getPlayer().getUniqueId().equals(BauServer.getInstance().getOwner())) {
             return;
         }

BauSystem_Main/src/de/steamwar/bausystem/features/world/SpectatorListener.java

@@ -41,6 +41,7 @@ import org.bukkit.event.block.BlockMultiPlaceEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.player.*;
+import org.bukkit.util.Vector;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -116,9 +117,11 @@ public class SpectatorListener implements Listener {
 
     private static void resendChunks(Player player) {
         Location location = player.getLocation().clone();
-        player.teleport(location.clone().add(16.0 * player.getClientViewDistance(), 0, 16.0 * player.getClientViewDistance()));
+        Vector velocity = player.getVelocity().clone();
+        player.teleport(location.clone().add(16.0 * player.getClientViewDistance() + 32, 0, 16.0 * player.getClientViewDistance() + 32));
         Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
             player.teleport(location);
+            player.setVelocity(velocity);
         }, 5);
     }
 
@@ -128,6 +131,7 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
+        if (BauSystem.DEV_SERVER) return;
         if (event.getPlayer().getUniqueId().equals(BauServer.getInstance().getOwner())) {
             return;
         }
@@ -148,7 +152,7 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        if (!anySupervisorOnline(null)) {
+        if (!anySupervisorOnline(null) && !BauSystem.DEV_SERVER) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 player.kickPlayer("");
             });
@@ -165,6 +169,7 @@ public class SpectatorListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         NO_TECHHIDER.remove(event.getPlayer());
+        if (BauSystem.DEV_SERVER) return;
         if (!anySupervisorOnline(event.getPlayer())) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 player.kickPlayer("");

BauSystem_Main/src/de/steamwar/bausystem/worlddata/WorldData.java

@@ -85,7 +85,7 @@ public class WorldData {
         try {
             worldData.toYAPION(new FileOutput(optionsFile)).close();
         } catch (IOException e) {
-            // Ignored
+            e.printStackTrace();
         }
     }
 }

BauSystem_Main/src/plugin.yml

@@ -1,7 +1,7 @@
 name: BauSystem
-authors: [Lixfel, YoyoNow, Chaoscaot, Zeanon]
+authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ]
 version: "2.0"
-depend: [WorldEdit, SpigotCore]
+depend: [ WorldEdit, SpigotCore ]
 load: POSTWORLD
 main: de.steamwar.bausystem.BauSystem
 api-version: "1.13"