Implement hardcoded windcharge check

Signed-off-by: Chaoscaot <max@maxsp.de>

.gitignore

@@ -20,4 +20,5 @@ lib
 /WebsiteBackend/data
 /WebsiteBackend/logs
 /WebsiteBackend/skins
-/WebsiteBackend/config.json
+/WebsiteBackend/config.json
+/WebsiteBackend/sessions

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/PlayerMovementWrapper21.java

@@ -0,0 +1,46 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+import net.minecraft.server.level.ServerPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public class PlayerMovementWrapper21 implements PlayerMovementWrapper {
+
+    @Override
+    public void setPosition(Player player, Object object) {
+        ServerboundMovePlayerPacket packetPlayInFlying = ((ServerboundMovePlayerPacket) object);
+        ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
+        if (packetPlayInFlying.hasPos) {
+            serverPlayer.setPosRaw(packetPlayInFlying.x, packetPlayInFlying.y, packetPlayInFlying.z);
+        }
+        if (packetPlayInFlying.hasRot) {
+            serverPlayer.setXRot(packetPlayInFlying.xRot);
+            serverPlayer.setYRot(packetPlayInFlying.yRot);
+        }
+    }
+
+    @Override
+    public Object convertToOut(Player player, Object object) {
+        return object;
+    }
+}

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/TickManager21.java

@@ -100,7 +100,6 @@ public class TickManager21 implements TickManager {
             manager.setFrozen(true);
             bukkitTask.cancel();
         }, 1, 1);
-        manager.tick();
     }
 
     @Override

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -52,6 +52,9 @@ FLAG_ITEMS=Items
 FLAG_NO_GRAVITY = No Gravity
 FLAG_TESTBLOCK=Testblock
 FLAG_CHANGED=Changed
+FLAG_WATER_DESTROY=Water Destroy
+FLAG_WATER_DESTROY_ALLOW=§coff
+FLAG_WATER_DESTROY_DENY=§aon
 FLAG_FIRE_ALLOW=§con
 FLAG_FIRE_DENY=§aoff
 FLAG_FREEZE_ACTIVE=§aon
@@ -140,6 +143,7 @@ BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
 BAU_INFO_ITEM_LORE_NO_GRAVITY = §7NoGravity§8: §e{0}
 BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
+BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Water Destroy§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
 BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -756,6 +760,9 @@ REGION_FIRE_DISABLED=§aFire damage activated in this region
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
 REGION_FREEZE_ENABLED=§cRegion frozen
 REGION_FREEZE_DISABLED=§aRegion thawed
+REGION_WATER_HELP=§8/§ewaterdestroy §8- §7Toggle water damage
+REGION_WATER_ENABLED=§aWater damage deactivated in this region
+REGION_WATER_DISABLED=§cWater damage activated in this region
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
 REGION_ITEMS_ENABLED=§aItems enabled in this region
 REGION_ITEMS_DISABLED=§cItems disabled in this region
@@ -1030,6 +1037,7 @@ SCHEMATIC_GUI_ITEM=§eSchematics
 # TNTListener
 TLS_MESSAGE_79=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1}
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7with Fuse 80§8)
-TLS_START_HELP=§8/§etls start §8: §7Start the TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8: §7Stop the TNT Listener
-TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon
+TLS_START_HELP=§8/§etls start §8- §7Start the TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8- §7Stop the TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aon
+TLS_TOGGLE_HELP=§8/§etls§8: §7Toggle the TNT Listener

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -54,6 +54,9 @@ FLAG_FREEZE_ACTIVE=§aan
 FLAG_FREEZE_INACTIVE=§caus
 FLAG_PROTECT_ACTIVE=§aan
 FLAG_PROTECT_INACTIVE=§caus
+FLAG_WATER_DESTROY=Wasserschaden
+FLAG_WATER_DESTROY_ALLOW=§cerlaubt
+FLAG_WATER_DESTROY_DENY=§aaus
 FLAG_TNT_ALLOW=§aan
 FLAG_TNT_DENY=§caus
 FLAG_TNT_ONLY_TB=§7Kein §eBaurahmen
@@ -122,6 +125,7 @@ BAU_INFO_ITEM_NAME=§eBau-Management
 BAU_INFO_ITEM_LORE_FIRE=§7Feuer§8: §e{0}
 BAU_INFO_ITEM_LORE_COLOR=§7Farbe§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Verändert§8: §e{0}
+BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Wasserschaden§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Gibt Informationen über den Bau
 BAU_INFO_COMMAND_OWNER=§7Besitzer§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -704,6 +708,9 @@ REGION_PROTECT_FALSE_REGION=§cDu befindest dich derzeit in keiner (M)WG-Region
 REGION_NO_GRAVITY_HELP = §8/§enogravity §8- §7Toggle NoGravity
 REGION_NO_GRAVITY_ENABLED = §aNoGravity aktiviert in dieser Region
 REGION_NO_GRAVITY_DISABLED = §cNoGravity deaktiviert in dieser Region
+REGION_WATER_HELP=§8/§ewaterblock §8- §7Wasserschaden umschalten
+REGION_WATER_ENABLED=§aWasserschaden deaktiviert
+REGION_WATER_DISABLED=§cWasserschaden aktiviert
 REGION_REGION_HELP_UNDO=§8/§eregion undo §8- §7Mache die letzten 20 /testblock oder /reset rückgängig
 REGION_REGION_HELP_REDO=§8/§eregion redo §8- §7Wiederhole die letzten 20 §8/§7rg undo
 REGION_REGION_HELP_RESTORE=§8/§eregion restore §8- §7Setzte die Region zurück, ohne das Gebaute zu löschen
@@ -961,6 +968,7 @@ TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Erset
 # Schematics
 SCHEMATIC_GUI_ITEM=§eSchematics
 TLS_MESSAGE_80=§7TLS§8> §7Tick §e{0} §8- §7TNT §e{1} §8(§e{2} §7mit Fuse 80§8)
-TLS_START_HELP=§8/§etls start §8: §7Starte den TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8: §7Stope den TNT Listener
-TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan
+TLS_START_HELP=§8/§etls start §8- §7Starte den TNT Listener
+TLS_STOP_HELP=§8/§etls stop §8- §7Stope den TNT Listener
+TLS_SCOREBOARD_ELEMENT=§eTLS§8: §aan
+TLS_TOGGLE_HELP=§8/§etls §8: §7Toggle den TNT Listener

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

@@ -40,10 +40,13 @@ import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.CRIUSleepEvent;
+import de.steamwar.core.Core;
 import de.steamwar.core.WorldEditRendererCUIEditor;
+import de.steamwar.core.WorldIdentifier;
 import de.steamwar.linkage.AbstractLinker;
 import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
+import de.steamwar.providers.BauServerInfo;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
@@ -121,6 +124,7 @@ public class BauSystem extends JavaPlugin implements Listener {
         } catch (AbstractLinker.LinkException e) {
             getLogger().log(Level.SEVERE, "Could not link a class.", e);
             Bukkit.shutdown();
+            return;
         }
 
         TickListener.impl.init();
@@ -131,6 +135,9 @@ public class BauSystem extends JavaPlugin implements Listener {
         new WorldEditRendererCUIEditor();
 
         Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
+
+        String identifier = BauServerInfo.getOwnerUser().getUUID().toString().replace("-", "");
+        WorldIdentifier.set("bau/" + Core.getVersion() + "/" + identifier);
     }
 
     @EventHandler

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

@@ -27,8 +27,6 @@ import de.steamwar.sql.SteamwarUser;
 import lombok.AllArgsConstructor;
 import org.bukkit.entity.Player;
 
-import java.util.HashSet;
-import java.util.Set;
 import java.util.function.Predicate;
 
 @AllArgsConstructor
@@ -39,13 +37,12 @@ public enum Permission {
         return bauweltMember.isSupervisor();
     }),
     BUILD(bauweltMember -> {
-        if (isTempOnlySpectator(bauweltMember)) return false;
         return bauweltMember.isBuild() || SUPERVISOR.permissionPredicate.test(bauweltMember);
     }),
     /**
      * Only used for {@link BauMemberUpdate}
      */
-    REAL_SPECTATOR(bauweltMember -> {
+    SPECTATOR(bauweltMember -> {
         return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
     }),
     /**
@@ -55,28 +52,6 @@ public enum Permission {
         return true;
     });
 
-    private static final Set<Integer> TEMP_ONLY_SPECTATOR = new HashSet<>();
-
-    private static boolean isTempOnlySpectator(BauweltMember bauweltMember) {
-        return TEMP_ONLY_SPECTATOR.contains(bauweltMember.getMemberID());
-    }
-    
-    public static boolean isTempOnlySpectator(Player player) {
-        return TEMP_ONLY_SPECTATOR.contains(SteamwarUser.get(player.getUniqueId()).getId());
-    }
-
-    public static void forceOnlySpectator(Player player) {
-        TEMP_ONLY_SPECTATOR.add(SteamwarUser.get(player.getUniqueId()).getId());
-        BauMemberUpdate.baumemberUpdate();
-    }
-
-    /**
-     * Only used by {@link BauMemberUpdate}
-     */
-    public static void removeForceOnlySpectator(Player player) {
-        TEMP_ONLY_SPECTATOR.remove(SteamwarUser.get(player.getUniqueId()).getId());
-    }
-
     private final Predicate<BauweltMember> permissionPredicate;
 
     public boolean hasPermission(BauweltMember bauweltMember) {
@@ -86,10 +61,10 @@ public enum Permission {
 
     public boolean hasPermission(Player member) {
         if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
-            return this != REAL_SPECTATOR;
+            return this != SPECTATOR;
         }
         BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauweltMember == null) return this == REAL_SPECTATOR;
+        if (bauweltMember == null) return this == SPECTATOR;
         return permissionPredicate.test(bauweltMember);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/autostart/AutostartListener.java

@@ -32,6 +32,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.data.type.Chest;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -120,6 +121,7 @@ public class AutostartListener implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
         if (regionStartTime.isEmpty()) {
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java

@@ -59,7 +59,7 @@ public class BackupCommand extends SWCommand {
         if (checkGlobalRegion(region, p)) {
             return;
         }
-        if (region.getFlags().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
+        if (region.getRegionData().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
             BauSystem.MESSAGE.send("BACKUP_CREATE_NO_CHANGE", p);
             return;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/BauInfoBauGuiItem.java

@@ -56,8 +56,8 @@ public class BauInfoBauGuiItem extends BauGuiItem {
         Region region = Region.getRegion(player.getLocation());
         List<String> stringList = new ArrayList<>();
         for (Flag flag : Flag.getFlags()) {
-            if (!region.getFlags().has(flag).isApplicable()) continue;
-            FlagOptional<?> value = region.getFlags().get(flag);
+            if (!region.getRegionData().has(flag).isApplicable()) continue;
+            FlagOptional<?> value = region.getRegionData().get(flag);
             if (value.isPresent()) {
                 stringList.add(BauSystem.MESSAGE.parse("BAU_INFO_ITEM_LORE_" + flag.name(), player, BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), player)));
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/ForceSpectatorCommand.java

@@ -1,71 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.bau;
-
-import de.steamwar.bausystem.Permission;
-import de.steamwar.command.PreviousArguments;
-import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeMapper;
-import de.steamwar.linkage.Linked;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-@Linked
-public class ForceSpectatorCommand extends SWCommand {
-
-    public ForceSpectatorCommand() {
-        super("forcespectator");
-    }
-
-    @Register
-    public void forceSpectator(@Validator("supervisor") Player player, @Mapper("builder") Player other) {
-        Permission.forceOnlySpectator(other);
-    }
-
-    @Mapper("builder")
-    public TypeMapper<Player> spectatorMapper() {
-        return new TypeMapper<>() {
-            @Override
-            public Player map(CommandSender commandSender, String[] previousArguments, String s) {
-                Player player = Bukkit.getPlayer(s);
-                if (player == null) {
-                    return null;
-                }
-                if (Permission.BUILD.hasPermission(player) && !Permission.SUPERVISOR.hasPermission(player)) {
-                    return player;
-                }
-                return null;
-            }
-
-            @Override
-            public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
-                return Bukkit.getOnlinePlayers().stream()
-                        .filter(Permission.BUILD::hasPermission)
-                        .filter(player -> !Permission.SUPERVISOR.hasPermission(player))
-                        .map(Player::getName)
-                        .collect(Collectors.toList());
-            }
-        };
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/bau/InfoCommand.java

@@ -50,8 +50,8 @@ public class InfoCommand extends SWCommand {
         BauSystem.MESSAGE.send("BAU_INFO_COMMAND_OWNER", p, SteamwarUser.byId(bauServer.getOwnerID()).getUserName());
         Region region = Region.getRegion(p.getLocation());
         for (Flag flag : Flag.getFlags()) {
-            if (!region.getFlags().has(flag).isApplicable()) continue;
-            FlagOptional<?> value = region.getFlags().get(flag);
+            if (!region.getRegionData().has(flag).isApplicable()) continue;
+            FlagOptional<?> value = region.getRegionData().get(flag);
             if (value.isPresent()) {
                 BauSystem.MESSAGE.send("BAU_INFO_COMMAND_FLAG", p, BauSystem.MESSAGE.parse(flag.getChatValue(), p), BauSystem.MESSAGE.parse(value.getWithDefault().getChatValue(), p));
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/Countingwand.java

@@ -21,9 +21,10 @@ package de.steamwar.bausystem.features.countingwand;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
-import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.ItemUtils;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWItem;
+import lombok.Data;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -31,13 +32,32 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
 
 @UtilityClass
 public class Countingwand {
 
+    @Data
+    public class CountingWandComponent implements SWPlayer.Component {
+        private Point pos1;
+        private Point pos2;
+
+        public boolean setPosition(boolean pos1, Point point) {
+            if (this.pos1 == null || this.pos2 == null) {
+                this.pos1 = point;
+                this.pos2 = point;
+                return true;
+            }
+            Point current = pos1 ? this.pos1 : this.pos2;
+            if (current.equals(point)) return false;
+            if (pos1) {
+                this.pos1 = point;
+            } else {
+                this.pos2 = point;
+            }
+            return true;
+        }
+    }
+
 	public static ItemStack getWandItem(Player player) {
 		ItemStack itemStack = new SWItem(Material.STICK, BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE1", player), BauSystem.MESSAGE.parse("COUNTINGWAND_ITEM_LORE2", player)), false, null).getItemStack();
 		ItemUtils.setItem(itemStack, "countingwand");
@@ -47,61 +67,20 @@ public class Countingwand {
 		return itemStack;
 	}
 
-	private final Map<String, Pair<Point, Point>> selections = new HashMap<>();
+    public boolean isCountingwand(ItemStack itemStack) {
+        return ItemUtils.isItem(itemStack, "countingwand");
+    }
 
-	public boolean isCountingwand(ItemStack itemStack) {
-		return ItemUtils.isItem(itemStack, "countingwand");
-	}
-
-	public void checkSelection(final Point point, final boolean pos1, final Player p) {
-		Pair<Point, Point> selection = selections.get(p.getUniqueId().toString());
-		final boolean newPos;
-		if (selection != null) {
-			if (pos1) {
-				newPos = !point.equals(selection.setKey(point));
-			} else {
-				newPos = !point.equals(selection.setValue(point));
-			}
-		} else {
-			if (pos1) {
-				selection = new Pair<>(point, null);
-			} else {
-				selection = new Pair<>(null, point);
-			}
-			selections.put(p.getUniqueId().toString(), selection);
-			newPos = true;
-		}
-
-		if (newPos) {
-			String dimension = getDimensions(p, selection.getKey(), selection.getValue());
-			String volume = getVolume(p, selection.getKey(), selection.getValue());
-			if (pos1) {
-				BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_RCLICK", p, point.getX(), point.getY(), point.getZ(), dimension, volume);
-			} else {
-				BauSystem.MESSAGE.send("COUNTINGWAND_MESSAGE_LCLICK", p, point.getX(), point.getY(), point.getZ(), dimension, volume);
-			}
-		}
-	}
-
-	public void removePlayer(Player p) {
-		selections.remove(p.getUniqueId().toString());
-	}
-
-	public String getVolume(Player player, final Point point1, final Point point2) {
-		if (point1 == null || point2 == null) {
-			return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_VOLUME", player, 0);
-		}
-		return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_VOLUME", player, getAmount(point1, point2));
-	}
-
-	public String getDimensions(Player player, final Point point1, final Point point2) {
-		if (point1 == null || point2 == null) {
-			return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_DIMENSION", player, 0, 0, 0);
-		}
-		return BauSystem.MESSAGE.parse("COUNTINGWAND_MESSAGE_DIMENSION", player, Math.abs(point1.getX() - point2.getX()) + 1, Math.abs(point1.getY() - point2.getY()) + 1, Math.abs(point1.getZ() - point2.getZ()) + 1);
-	}
-
-	public int getAmount(final Point point1, final Point point2) {
-		return (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
-	}
+    public void checkSelection(final Point point, final boolean pos1, final Player p) {
+        SWPlayer player = SWPlayer.of(p);
+        CountingWandComponent countingWandComponent = player.getComponentOrDefault(CountingWandComponent.class, CountingWandComponent::new);
+        if (countingWandComponent.setPosition(pos1, point)) {
+            Point point1 = countingWandComponent.pos1;
+            Point point2 = countingWandComponent.pos2;
+            int amount = (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
+            String dimension = player.using(BauSystem.MESSAGE).parse("COUNTINGWAND_MESSAGE_VOLUME", amount);
+            String volume = player.parse("COUNTINGWAND_MESSAGE_DIMENSION", Math.abs(point1.getX() - point2.getX()) + 1, Math.abs(point1.getY() - point2.getY()) + 1, Math.abs(point1.getZ() - point2.getZ()) + 1);
+            player.sendMessage(pos1 ? "COUNTINGWAND_MESSAGE_RCLICK" : "COUNTINGWAND_MESSAGE_LCLICK", point.getX(), point.getY(), point.getZ(), dimension, volume);
+        }
+    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/countingwand/CountingwandListener.java

@@ -27,7 +27,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.RayTraceResult;
 
 import java.util.Objects;
@@ -67,9 +66,4 @@ public class CountingwandListener implements Listener {
 		event.setCancelled(true);
 		Countingwand.checkSelection(Point.fromLocation(Objects.requireNonNull(event.getClickedBlock()).getLocation()), false, event.getPlayer());
 	}
-
-	@EventHandler
-	public void onLeave(PlayerQuitEvent event) {
-		Countingwand.removePlayer(event.getPlayer());
-	}
 }

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

@@ -31,10 +31,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class DesignEndStone {
@@ -56,11 +53,10 @@ public class DesignEndStone {
         this.maxY = region.getBuildArea().getMaxPoint(false).getY();
         this.maxZ = region.getBuildArea().getMaxPoint(false).getZ();
 
-        limited = region.getGameModeConfig().Schematic.Limited
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getValue() == 0)
-                .flatMap(entry -> entry.getKey().stream())
+        limited = Arrays.stream(Material.values())
+                .filter(Material::isBlock)
+                .filter(material -> !material.isLegacy())
+                .filter(material -> material.getBlastResistance() > region.getGameModeConfig().Schematic.MaxDesignBlastResistance)
                 .collect(Collectors.toSet());
         calculateFromBottom = region.getGameModeConfig().Arena.NoFloor;
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/Detonator.java

@@ -25,8 +25,11 @@ import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.features.autostart.AutostartListener;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.entity.RFallingBlockEntity;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -45,7 +48,28 @@ import java.util.*;
 @UtilityClass
 public class Detonator {
 
-    private static final Map<Player, REntityServer> ENTITIES_MAP = new HashMap<>();
+    public class DetonatorComponent implements SWPlayer.Component {
+        private final REntityServer entities = new REntityServer();
+
+        @Getter
+        @Setter
+        private boolean hasUpdated = false;
+
+        @Override
+        public void onMount(SWPlayer player) {
+            entities.addPlayer(player.getPlayer());
+            entities.setCallback((player1, entity, action) -> {
+                Vector vector = new Vector(entity.getX(), entity.getY(), entity.getZ());
+                DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player1);
+            });
+        }
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            entities.close();
+        }
+    }
+
     private static final Vector HALF = new Vector(0.5, 0, 0.5);
 
     public static boolean isDetonator(ItemStack itemStack) {
@@ -53,28 +77,19 @@ public class Detonator {
     }
 
     public static void showDetonator(Player p, List<Location> locs) {
-        if (ENTITIES_MAP.containsKey(p)) return;
-        REntityServer entities = new REntityServer();
-        entities.setCallback((player, rEntity, entityAction) -> {
-            Vector vector = new Vector(rEntity.getX(), rEntity.getY(), rEntity.getZ());
-            DetonatorListener.addLocationToDetonator(vector.toLocation(player.getWorld()).getBlock().getLocation(), player);
-            DetonatorListener.HAS_UPDATED.add(player);
-        });
-        entities.addPlayer(p);
-        ENTITIES_MAP.put(p, entities);
-
+        DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
         locs.forEach(location -> {
-            RFallingBlockEntity entity = new RFallingBlockEntity(entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
             entity.setNoGravity(true);
         });
     }
 
     public static void hideDetonator(Player p) {
-        ENTITIES_MAP.remove(p).close();
+        SWPlayer.of(p).removeComponent(DetonatorComponent.class);
     }
 
     public static boolean hasActiveDetonatorShow(Player p) {
-        return ENTITIES_MAP.containsKey(p);
+        return SWPlayer.of(p).hasComponent(DetonatorComponent.class);
     }
 
     public static void activateDetonator(DetonatorStorage detonator) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/DetonatorListener.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.detonator.storage.DetonatorStorage;
 import de.steamwar.bausystem.features.detonator.storage.ItemStorage;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -36,15 +37,11 @@ import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerSwapHandItemsEvent;
 
-import java.util.HashSet;
-import java.util.Set;
-
 @Linked
 public class DetonatorListener implements Listener {
 
-    static final Set<Player> HAS_UPDATED = new HashSet<>();
-
     static void addLocationToDetonator(Location location, Player p) {
+        SWPlayer.of(p).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
         Detoblock detoblock = Detonator.getBlock(location.getBlock());
         if (detoblock == Detoblock.INVALID) {
             SWUtils.sendToActionbar(p, BauSystem.MESSAGE.parse("DETONATOR_INVALID_BLOCK", p));
@@ -66,64 +63,59 @@ public class DetonatorListener implements Listener {
 
     @EventHandler
     public void onBlockBreak(BlockBreakEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         Player p = event.getPlayer();
         if (Detonator.isDetonator(p.getInventory().getItemInMainHand())) {
             event.setCancelled(true);
             addLocationToDetonator(event.getBlock().getLocation(), p);
-            HAS_UPDATED.add(event.getPlayer());
         }
     }
 
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getItem())) {
-            return;
-        }
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Detonator.isDetonator(event.getItem())) return;
 
         if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
             event.setCancelled(true);
             DetonatorStorage detonator = new ItemStorage(event.getPlayer());
             Detonator.activateDetonator(detonator);
-            HAS_UPDATED.add(event.getPlayer());
+            SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer()) ||!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer()) || !Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
             if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
                 Detonator.hideDetonator(event.getPlayer());
             }
-        } else {
-            if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
-                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
-            }
+            return;
         }
-
-        if (HAS_UPDATED.contains(event.getPlayer())) {
-            HAS_UPDATED.remove(event.getPlayer());
-            if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
-                Detonator.hideDetonator(event.getPlayer());
-                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
-            }
+        if (!Detonator.hasActiveDetonatorShow(event.getPlayer())) {
+            Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
+            return;
         }
+        Detonator.DetonatorComponent component = SWPlayer.of(event.getPlayer())
+                .getComponentAndFilter(Detonator.DetonatorComponent.class, Detonator.DetonatorComponent::isHasUpdated)
+                .orElse(null);
+        if (component == null) return;
+        component.setHasUpdated(false);
+        Detonator.hideDetonator(event.getPlayer());
+        Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
     }
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
-            HAS_UPDATED.add(event.getPlayer());
-        }
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) return;
+        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
     }
 
     @EventHandler
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
-            HAS_UPDATED.add(event.getPlayer());
-        }
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!(Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem()))) return;
+        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.features.loader.elements.LoaderInteractionElement;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderTNT;
 import de.steamwar.bausystem.features.loader.elements.impl.LoaderWait;
 import de.steamwar.bausystem.shared.EnumDisplay;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
@@ -40,21 +41,17 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class Loader implements Listener {
-
-    private static final Map<Player, Loader> LOADER_MAP = new HashMap<>();
+public class Loader implements Listener, SWPlayer.Component {
 
     public static Loader getLoader(Player player) {
-        return LOADER_MAP.get(player);
+        return SWPlayer.of(player).getComponent(Loader.class).orElse(null);
     }
 
     public static void newLoader(Player player) {
-        LOADER_MAP.put(player, new Loader(player));
+        SWPlayer.of(player).setComponent(new Loader(player));
     }
 
     private final Player p;
@@ -145,7 +142,7 @@ public class Loader implements Listener {
             recorder = null;
         }
         elements.clear();
-        LOADER_MAP.remove(p);
+        SWPlayer.of(p).removeComponent(Loader.class);
     }
 
     public boolean setTicksBetweenShots(int delay) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java

@@ -29,6 +29,7 @@ import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
@@ -156,6 +157,7 @@ public class Loadtimer implements Listener {
     }
 
     public void onTntExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
         if (region.getBuildArea().inRegion(event.getLocation(), true) && stage == Stage.IGNITION) {
             stage = Stage.END;
             explode = TPSUtils.currentRealTick.get();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.Reflection;
 import de.steamwar.bausystem.region.Point;
+import de.steamwar.core.SWPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Particle;
@@ -34,7 +35,7 @@ import org.bukkit.entity.Player;
 
 import java.util.*;
 
-public class ObserverTracer {
+public class ObserverTracer implements SWPlayer.Component {
 
     private static final Set<BlockFace> ALLOWED = EnumSet.of(BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST, BlockFace.UP, BlockFace.DOWN);
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerCommand.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.observer;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.command.SWCommand;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.entity.Player;
 
@@ -41,23 +42,23 @@ public class ObserverTracerCommand extends SWCommand {
     @Register(value = "disable", description = "OBSERVER_HELP_DISABLE")
     public void disable(Player p) {
         ObserverTracerListener.enabled.remove(p);
-        ObserverTracerListener.observerTracerMap.remove(p);
+        SWPlayer.of(p).removeComponent(ObserverTracer.class);
         BauSystem.MESSAGE.send("OBSERVER_DISABLE", p);
     }
 
     @Register(value = "delete", description = "OBSERVER_HELP_DELETE")
     public void delete(@Validator Player p) {
-        ObserverTracerListener.observerTracerMap.remove(p);
+        SWPlayer.of(p).removeComponent(ObserverTracer.class);
         BauSystem.MESSAGE.send("OBSERVER_DELETE", p);
     }
 
     @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
     public void retrace(@Validator Player p) {
-        if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
+        if (SWPlayer.of(p).hasComponent(ObserverTracer.class)) {
             BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
             return;
         }
-        ObserverTracerListener.observerTracerMap.get(p).trace();
+        SWPlayer.of(p).getComponent(ObserverTracer.class).ifPresent(ObserverTracer::trace);
         BauSystem.MESSAGE.send("OBSERVER_RETRACE_DONE", p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracerListener.java

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.observer;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -34,23 +35,19 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 @Linked
 public class ObserverTracerListener implements Listener {
 
     static Set<Player> enabled = new HashSet<>();
-    static Map<Player, ObserverTracer> observerTracerMap = new HashMap<>();
 
     public ObserverTracerListener() {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-            observerTracerMap.forEach((player, observerTracer) -> {
-                if (player.getGameMode() == GameMode.SPECTATOR) {
-                    observerTracer.show();
-                }
+            SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
+                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                pair.getComponent().show();
             });
         }, 15L, 15L);
     }
@@ -58,20 +55,16 @@ public class ObserverTracerListener implements Listener {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!enabled.contains(event.getPlayer())) {
-            return;
-        }
-        if (event.getClickedBlock() == null) {
-            return;
-        }
-        if (observerTracerMap.containsKey(event.getPlayer())) {
-            ObserverTracer observerTracer = observerTracerMap.get(event.getPlayer());
+        if (!enabled.contains(event.getPlayer())) return;
+        if (event.getClickedBlock() == null) return;
+        ObserverTracer observerTracer = SWPlayer.of(event.getPlayer()).getComponent(ObserverTracer.class).orElse(null);
+        if (observerTracer != null) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (!observerTracer.trace()) {
                     createNew(event);
                 }
-                observerTracerMap.forEach((player, o) -> {
-                    o.trace();
+                SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
+                    pair.getComponent().trace();
                 });
             }, 1L);
         } else {
@@ -86,13 +79,13 @@ public class ObserverTracerListener implements Listener {
         if (event.getClickedBlock().getType() == Material.OBSERVER) {
             ObserverTracer observerTracer = new ObserverTracer(event.getPlayer(), event.getClickedBlock());
             observerTracer.trace();
-            observerTracerMap.put(event.getPlayer(), observerTracer);
+            SWPlayer.of(event.getPlayer()).setComponent(observerTracer);
         }
     }
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(observerTracerMap::remove);
+        event.getNewBuilder().forEach(player -> SWPlayer.of(player).removeComponent(ObserverTracer.class));
     }
 
     @EventHandler
@@ -103,6 +96,5 @@ public class ObserverTracerListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         enabled.remove(event.getPlayer());
-        observerTracerMap.remove(event.getPlayer());
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ColorCommand.java

@@ -51,17 +51,17 @@ public class ColorCommand extends SWCommand {
     public void genericColorSet(@Validator Player p, ColorMode color, ColorizationType colorizationType) {
         if (colorizationType == ColorizationType.GLOBAL) {
             Region.getRegions().forEach(region -> {
-                region.getFlags().set(Flag.COLOR, color);
+                region.getRegionData().set(Flag.COLOR, color);
             });
             BauSystem.MESSAGE.send("REGION_COLOR_GLOBAL", p, BauSystem.MESSAGE.parse(color.getChatValue(), p));
             return;
         }
         Region region = Region.getRegion(p.getLocation());
-        if (!region.getFlags().has(Flag.COLOR).isWritable()) {
+        if (!region.getRegionData().has(Flag.COLOR).isWritable()) {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }
-        region.getFlags().set(Flag.COLOR, color);
+        region.getRegionData().set(Flag.COLOR, color);
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireCommand.java

@@ -53,11 +53,11 @@ public class FireCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
-            region.getFlags().set(Flag.FIRE, FireMode.DENY);
+        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+            region.getRegionData().set(Flag.FIRE, FireMode.DENY);
             return true;
         } else {
-            region.getFlags().set(Flag.FIRE, FireMode.ALLOW);
+            region.getRegionData().set(Flag.FIRE, FireMode.ALLOW);
             return false;
         }
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FireListener.java

@@ -36,12 +36,12 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFireDamage(BlockBurnEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @EventHandler
     public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class FireListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FIRE).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FIRE).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeCommand.java

@@ -53,11 +53,11 @@ public class FreezeCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
-            region.getFlags().set(Flag.FREEZE, FreezeMode.INACTIVE);
+        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+            region.getRegionData().set(Flag.FREEZE, FreezeMode.INACTIVE);
             return false;
         } else {
-            region.getFlags().set(Flag.FREEZE, FreezeMode.ACTIVE);
+            region.getRegionData().set(Flag.FREEZE, FreezeMode.ACTIVE);
             return true;
         }
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java

@@ -46,9 +46,19 @@ import org.bukkit.event.player.PlayerInteractEvent;
 @Linked
 public class FreezeListener implements Listener, ScoreboardElement {
 
+    @EventHandler
+    public void onBlockExplode(BlockExplodeEvent e) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        e.setCancelled(true);
+        BlockState state = e.getBlock().getState();
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+            state.update(true, false);
+        }, 1L);
+    }
+
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         e.setCancelled(true);
         if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -60,7 +70,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onBlockCanBuild(BlockCanBuildEvent e) {
         if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         if (e.getMaterial() == Material.TNT) {
             e.setBuildable(false);
             e.getBlock().setType(Material.TNT, false);
@@ -69,14 +79,14 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
                 BlockState state = e.getSourceBlock().getState();
                 NoteBlock noteBlock = (NoteBlock) state.getBlockData();
@@ -101,44 +111,44 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setNewCurrent(e.getOldCurrent());
         }
     }
 
     @EventHandler
     public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onInventoryMoveEvent(InventoryMoveItemEvent e) {
-        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -147,7 +157,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     public void onBlockBreak(BlockBreakEvent e) {
         if (Core.getVersion() < 19) return;
         if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
             e.getBlock().setType(Material.BARRIER, false);
             e.getBlock().setType(Material.AIR, false);
@@ -170,35 +180,35 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -206,7 +216,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent e) {
         if (e.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        if (Region.getRegion(e.getClickedBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             Block block = e.getClickedBlock();
             if (block.getType() == Material.LEVER) {
                 Switch data = ((Switch) block.getBlockData());
@@ -218,7 +228,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onBlockFade(BlockFadeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -235,7 +245,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsCommand.java

@@ -55,11 +55,11 @@ public class ItemsCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
-            region.getFlags().set(Flag.ITEMS, ItemMode.INACTIVE);
+        if (region.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
+            region.getRegionData().set(Flag.ITEMS, ItemMode.INACTIVE);
             return false;
         } else {
-            region.getFlags().set(Flag.ITEMS, ItemMode.ACTIVE);
+            region.getRegionData().set(Flag.ITEMS, ItemMode.ACTIVE);
             return true;
         }
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ItemsListener.java

@@ -37,7 +37,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onItemSpawn(ItemSpawnEvent event) {
-        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
             event.setCancelled(true);
         }
     }
@@ -54,7 +54,7 @@ public class ItemsListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityCommand.java

@@ -53,11 +53,11 @@ public class NoGravityCommand extends SWCommand {
     }
 
     private boolean toggle(Region region) {
-        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
-            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
+        if (region.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+            region.getRegionData().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
             return false;
         } else {
-            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
+            region.getRegionData().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
             return true;
         }
     }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/NoGravityListener.java

@@ -37,7 +37,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event) {
         if (event.getEntityType() == EntityType.PLAYER) return;
-        if (Region.getRegion(event.getLocation()).getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
             event.getEntity().setGravity(false);
         }
     }
@@ -54,7 +54,7 @@ public class NoGravityListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectCommand.java

@@ -39,18 +39,18 @@ public class ProtectCommand extends SWCommand {
     public void genericProtectCommand(@Validator Player p) {
         Region region = regionCheck(p);
         if (region == null) return;
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
-            region.getFlags().set(Flag.PROTECT, ProtectMode.INACTIVE);
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+            region.getRegionData().set(Flag.PROTECT, ProtectMode.INACTIVE);
             RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
         } else {
-            region.getFlags().set(Flag.PROTECT, ProtectMode.ACTIVE);
+            region.getRegionData().set(Flag.PROTECT, ProtectMode.ACTIVE);
             RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
         }
     }
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
+        if (!region.getRegionData().has(Flag.PROTECT).isApplicable()) {
             BauSystem.MESSAGE.send("REGION_PROTECT_FALSE_REGION", player);
             return null;
         }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ProtectListener.java

@@ -41,7 +41,7 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     private void explode(List<Block> blockList, Location location) {
         Region region = Region.getRegion(location);
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
         Point p1 = region.getBuildArea().getMinPoint(true);
         Point p2 = region.getTestblockArea().getMinPoint(true);
         int floorLevel = Math.min(p1.getY(), p2.getY());
@@ -70,7 +70,7 @@ public class ProtectListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionCommand.java

@@ -102,7 +102,7 @@ public class RegionCommand extends SWCommand {
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
                     .ignoreAir(true)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {
@@ -124,7 +124,7 @@ public class RegionCommand extends SWCommand {
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
                     .ignoreAir(true)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
             RegionUtils.message(region, "REGION_REGION_RESTORED");
         } catch (SecurityException e) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/RegionListener.java

@@ -182,6 +182,6 @@ public class RegionListener implements Listener {
     }
 
     private static void tagChangedRegion(final Location location) {
-        Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
+        Region.getRegion(location).getRegionData().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java

@@ -53,9 +53,8 @@ public class ResetCommand extends SWCommand {
         if (region == null) return;
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
-            region.getFlags().clear();
             region.getRegionData().clear();
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
@@ -84,7 +83,7 @@ public class ResetCommand extends SWCommand {
         }
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, true);
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTCommand.java

@@ -92,7 +92,7 @@ public class TNTCommand extends SWCommand {
             @Override
             public List<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                     return new ArrayList<>(tntModeMap.keySet());
                 } else {
                     return new ArrayList<>(tntModeMapReduced.keySet());
@@ -102,7 +102,7 @@ public class TNTCommand extends SWCommand {
             @Override
             public TNTMode map(CommandSender sender, PreviousArguments previousArguments, String s) {
                 Region region = Region.getRegion(((Player) sender).getLocation());
-                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
                     return tntModeMap.getOrDefault(s, null);
                 } else {
                     return tntModeMapReduced.getOrDefault(s, null);
@@ -124,23 +124,23 @@ public class TNTCommand extends SWCommand {
     }
 
     private void tntToggle(Region region, TNTMode requestedMode, String requestedMessage) {
-        if (requestedMode != null && region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
-            region.getFlags().set(Flag.TNT, requestedMode);
+        if (requestedMode != null && region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+            region.getRegionData().set(Flag.TNT, requestedMode);
             RegionUtils.actionBar(region, requestedMessage);
             return;
         }
-        switch (region.getFlags().get(Flag.TNT).getWithDefault()) {
+        switch (region.getRegionData().get(Flag.TNT).getWithDefault()) {
             case ALLOW:
             case ONLY_TB:
-                region.getFlags().set(Flag.TNT, TNTMode.DENY);
+                region.getRegionData().set(Flag.TNT, TNTMode.DENY);
                 RegionUtils.actionBar(region, getDisableMessage());
                 break;
             case DENY:
-                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
-                    region.getFlags().set(Flag.TNT, TNTMode.ONLY_TB);
+                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                    region.getRegionData().set(Flag.TNT, TNTMode.ONLY_TB);
                     RegionUtils.actionBar(region, getTestblockEnableMessage());
                 } else {
-                    region.getFlags().set(Flag.TNT, TNTMode.ALLOW);
+                    region.getRegionData().set(Flag.TNT, TNTMode.ALLOW);
                     RegionUtils.actionBar(region, getEnableMessage());
                 }
                 break;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TNTListener.java

@@ -26,8 +26,10 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TNTMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -39,11 +41,14 @@ import java.util.List;
 @Linked
 public class TNTListener implements Listener, ScoreboardElement {
 
-    private void explode(List<Block> blockList) {
+    private void explode(List<Block> blockList, boolean destroy) {
         blockList.removeIf(block -> {
             Region region = Region.getRegion(block.getLocation());
-            TNTMode value = region.getFlags().get(Flag.TNT).getWithDefault();
+            TNTMode value = region.getRegionData().get(Flag.TNT).getWithDefault();
             if (value == TNTMode.ALLOW) {
+                if (destroy && block.getType() != Material.TNT) {
+                    block.setType(Material.AIR);
+                }
                 return false;
             } else if (value == TNTMode.ONLY_TB) {
                 if (region.getBuildArea().inRegion(block.getLocation(), true)) {
@@ -57,12 +62,16 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onBlockExplode(BlockExplodeEvent event) {
-        explode(event.blockList());
+        explode(event.blockList(), false);
     }
 
     @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onExplode(EntityExplodeEvent event) {
-        explode(event.blockList());
+        if (!(event.getEntity() instanceof TNTPrimed)) {
+            event.blockList().clear();
+            return;
+        }
+        explode(event.blockList(), true);
     }
 
     @Override
@@ -77,7 +86,7 @@ public class TNTListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getFlags().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
-        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().get(Flag.TNT).getWithDefault().getChatValue(), p);
+        if (region.getRegionData().get(Flag.TNT).isWithDefault(TNTMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.TNT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.TNT).getWithDefault().getChatValue(), p);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/TestblockCommand.java

@@ -72,6 +72,14 @@ public class TestblockCommand extends SWCommand {
         resetRegion(p, node, isExtension ? RegionExtensionType.EXTENSION : RegionExtensionType.NORMAL, isIgnoreAir, isOnlyColor, replaceTNT, replaceWater);
     }
 
+    @Register(value="default")
+    public void setTestblockDefault(Player p) {
+        Region region = regionCheck(p);
+        if (region == null) return;
+        region.getRegionData().setTestblockSchematic(null);
+        resetRegion(p, null, RegionExtensionType.EXTENSION, false, false, false, false);
+    }
+
     private void resetRegion(Player p, SchematicNode node, RegionExtensionType regionExtensionType, boolean ignoreAir, boolean onlyColors, boolean removeTNT, boolean removeWater) {
         Region region = regionCheck(p);
         if (region == null) return;
@@ -92,29 +100,10 @@ public class TestblockCommand extends SWCommand {
             }
         }
 
-        // Beta Tester enabled
-        switch (BauServer.getInstance().getOwnerID()) {
-            case 245:
-            case 403:
-            case 1898:
-            case 3320:
-            case 4603:
-            case 5262:
-            case 5399:
-            case 6032:
-            case 7862:
-            case 11077:
-            case 11888:
-            case 12258:
-            case 16009:
-                if (node == null) {
-                    node = region.getRegionData().getTestblockSchematic();
-                } else {
-                    region.getRegionData().setTestblockSchematic(node);
-                }
-                break;
-            default:
-                break;
+        if (node == null) {
+            node = region.getRegionData().getTestblockSchematic();
+        } else {
+            region.getRegionData().setTestblockSchematic(node);
         }
 
         PasteBuilder.ClipboardProvider clipboardProvider;
@@ -130,7 +119,7 @@ public class TestblockCommand extends SWCommand {
                     .onlyColors(onlyColors)
                     .removeTNT(removeTNT)
                     .removeWater(removeWater)
-                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
+                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
             region.getTestblockArea().reset(pasteBuilder, regionExtensionType == RegionExtensionType.EXTENSION);
             RegionUtils.message(region, "REGION_TB_DONE");
         } catch (SecurityException e) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyCommand.java

@@ -0,0 +1,64 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.region;
+
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.RegionUtils;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.WaterDestroyMode;
+import de.steamwar.command.SWCommand;
+import de.steamwar.linkage.Linked;
+import org.bukkit.entity.Player;
+
+@Linked
+public class WaterDestroyCommand extends SWCommand {
+    public WaterDestroyCommand() {
+        super("waterdestroy");
+    }
+
+    private String getEnableMessage(){
+        return "REGION_WATER_ENABLED";
+    }
+
+    private String getDisableMessage(){
+        return "REGION_WATER_DISABLED";
+    }
+
+    @Register(description = "REGION_WATER_HELP")
+    public void toggleCommand(@Validator Player p) {
+        Region region = Region.getRegion(p.getLocation());
+
+        if (toggle(region)) {
+            RegionUtils.actionBar(region, getEnableMessage());
+        } else {
+            RegionUtils.actionBar(region, getDisableMessage());
+        }
+    }
+
+    private boolean toggle(Region region) {
+        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) {
+            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.ALLOW);
+            return false;
+        } else {
+            region.getRegionData().set(Flag.WATER_DESTROY, WaterDestroyMode.DENY);
+            return true;
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/WaterDestroyListener.java

@@ -0,0 +1,57 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.features.region;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.region.Region;
+import de.steamwar.bausystem.region.flags.Flag;
+import de.steamwar.bausystem.region.flags.WaterDestroyMode;
+import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.linkage.Linked;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFromToEvent;
+
+@Linked
+public class WaterDestroyListener implements Listener, ScoreboardElement {
+
+    @EventHandler
+    public void onBlockFromTo(BlockFromToEvent event) {
+        if (event.getBlock().getType() == Material.WATER && event.getToBlock().getType() != Material.AIR && Region.getRegion(event.getBlock().getLocation()).getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.DENY)) event.setCancelled(true);
+    }
+
+    @Override
+    public ScoreboardGroup getGroup() {
+        return ScoreboardGroup.REGION;
+    }
+
+    @Override
+    public int order() {
+        return 5;
+    }
+
+    @Override
+    public String get(Region region, Player p) {
+        if (region.getRegionData().get(Flag.WATER_DESTROY).isWithDefault(WaterDestroyMode.ALLOW)) return null;
+        return "§e" + BauSystem.MESSAGE.parse(Flag.WATER_DESTROY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getRegionData().get(Flag.WATER_DESTROY).getWithDefault().getChatValue(), p);
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ColorBauGuiItem.java

@@ -84,14 +84,14 @@ public class ColorBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        ColorMode mode = region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode mode = region.getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK);
         return new SWItem(mapColor(mode), BauSystem.MESSAGE.parse("REGION_ITEM_COLOR", player, BauSystem.MESSAGE.parse(mode.getChatValue(), player))).getItemStack();
     }
 
     @Override
     public boolean click(ClickType click, Player p) {
         p.closeInventory();
-        ColorMode current = Region.getRegion(p.getLocation()).getFlags().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode current = Region.getRegion(p.getLocation()).getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK);
         List<SWListInv.SWListEntry<ColorMode>> items = new ArrayList<>();
         for (ColorMode value : ColorMode.values()) {
             items.add(new SWListInv.SWListEntry<>(new SWItem(mapColor(value), (byte) 0, "§f" + BauSystem.MESSAGE.parse(value.getChatValue(), p), Collections.emptyList(), value == current, clickType -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FireBauGuiItem.java

@@ -42,10 +42,10 @@ public class FireBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.FIRE).isApplicable()) {
+        if (!region.getRegionData().has(Flag.FIRE).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
             return new SWItem(Material.FIRE_CHARGE, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.FIREWORK_STAR, BauSystem.MESSAGE.parse("REGION_ITEM_FIRE_DISALLOW", player)).getItemStack();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/FreezeBauGuiItem.java

@@ -42,10 +42,10 @@ public class FreezeBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.FREEZE).isApplicable()) {
+        if (!region.getRegionData().has(Flag.FREEZE).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             return new SWItem(Material.GUNPOWDER, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_ALLOW", player)).getItemStack();
         } else {
             return new SWItem(Material.REDSTONE, BauSystem.MESSAGE.parse("REGION_ITEM_FREEZE_DISALLOW", player)).getItemStack();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/ProtectBauGuiItem.java

@@ -43,10 +43,10 @@ public class ProtectBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
+        if (!region.getRegionData().has(Flag.PROTECT).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
             return SWUtils.setCustomModelData(new SWItem(Material.OBSIDIAN, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_ALLOW", player)), 1).getItemStack();
         } else {
             return SWUtils.setCustomModelData(new SWItem(Material.STONE, BauSystem.MESSAGE.parse("REGION_ITEM_PROTECT_DISALLOW", player)), 1).getItemStack();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/items/TntBauGuiItem.java

@@ -42,7 +42,7 @@ public class TntBauGuiItem extends BauGuiItem {
 
     @Override
     public ItemStack getItem(Player player) {
-        switch (Region.getRegion(player.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
+        switch (Region.getRegion(player.getLocation()).getRegionData().get(Flag.TNT).getWithDefault()) {
             case DENY:
                 return new SWItem(Material.MINECART, BauSystem.MESSAGE.parse("REGION_ITEM_TNT_OFF", player)).getItemStack();
             case ONLY_TB:
@@ -55,7 +55,7 @@ public class TntBauGuiItem extends BauGuiItem {
     @Override
     public boolean click(ClickType click, Player p) {
         if (click == ClickType.LEFT) {
-            switch (Region.getRegion(p.getLocation()).getFlags().get(Flag.TNT).getWithDefault()) {
+            switch (Region.getRegion(p.getLocation()).getRegionData().get(Flag.TNT).getWithDefault()) {
                 case DENY:
                     updateTntMode(TNTMode.ALLOW, p);
                     break;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptListener.java

@@ -67,7 +67,7 @@ public class ScriptListener implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
-        ScriptRunner.remove(event.getPlayer());
+        playerSet.remove(event.getPlayer());
     }
 
     @EventHandler

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptRunner.java

@@ -23,8 +23,11 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.script.lua.CommandRegister;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.SteamWarPlatform;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.sql.Script;
 import de.steamwar.sql.SteamwarUser;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
@@ -44,12 +47,25 @@ public class ScriptRunner {
     // Key   -> bau-script-<BUCH NAME>
     // Value -> <LUA Script>
 
-    private static final Map<Player, Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>>> EVENT_MAP = new HashMap<>();
-    private static final Map<Player, Map<Hotkey, List<LuaFunction>>> HOTKEY_MAP = new HashMap<>();
-    private static final Map<Player, Map<String, CommandRegister>> COMMAND_MAP = new HashMap<>();
+    public class ScriptData implements SWPlayer.Component {
+        private Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>> events = new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class);
+        private Map<Hotkey, List<LuaFunction>> hotkeys = new HashMap<>();
+        private Map<String, CommandRegister> commands = new HashMap<>();
+
+        @Getter
+        private Set<String> calledCommands = new HashSet<>();
+
+        @Getter
+        @Setter
+        private Long lastF = Long.MAX_VALUE;
+
+        @Getter
+        @Setter
+        private boolean ignore;
+    }
 
     public Set<String> getCommandsOfPlayer(Player player) {
-        return COMMAND_MAP.getOrDefault(player, new HashMap<>()).keySet();
+        return SWPlayer.of(player).getComponentOrDefault(ScriptData.class, ScriptData::new).commands.keySet();
     }
 
     public static void runScript(String script, Player player) {
@@ -64,10 +80,12 @@ public class ScriptRunner {
 
     public static void createGlobalScript(List<String> scripts, Player player) {
         remove(player);
+        SWPlayer swPlayer = SWPlayer.of(player);
+        ScriptData scriptData = swPlayer.getComponentOrDefault(ScriptData.class, ScriptData::new);
         Globals globals = SteamWarPlatform.createGlobalGlobals(player,
-                (s, luaFunction) -> EVENT_MAP.computeIfAbsent(player, player1 -> new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class)).computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
-                (s, luaFunction) -> HOTKEY_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).computeIfAbsent(Hotkey.fromString(s), s1 -> new ArrayList<>()).add(luaFunction),
-                commandRegister -> COMMAND_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).put(commandRegister.getName(), commandRegister));
+                (s, luaFunction) -> scriptData.events.computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
+                (s, luaFunction) -> scriptData.hotkeys.computeIfAbsent(Hotkey.fromString(s), s1 -> new ArrayList<>()).add(luaFunction),
+                commandRegister -> scriptData.commands.put(commandRegister.getName(), commandRegister));
 
         for (String script : scripts) {
             catchScript("SCRIPT_ERROR_GLOBAL", player, () -> globals.load(script).call());
@@ -75,13 +93,14 @@ public class ScriptRunner {
     }
 
     public static void remove(Player player) {
-        EVENT_MAP.remove(player);
-        COMMAND_MAP.remove(player);
-        HOTKEY_MAP.remove(player);
+        SWPlayer.of(player).removeComponent(ScriptData.class);
     }
 
     public static void callEvent(Player player, SteamWarGlobalLuaPlugin.EventType event, LuaValue eventValue, Event wrappedEvent) {
-        List<LuaFunction> luaFunctions = EVENT_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(event, Collections.emptyList());
+        List<LuaFunction> luaFunctions = SWPlayer.of(player).getComponent(ScriptData.class)
+                .map(scriptData -> scriptData.events)
+                .orElse(Collections.emptyMap())
+                .getOrDefault(event, Collections.emptyList());
         if (luaFunctions.isEmpty()) {
             if(event == SteamWarGlobalLuaPlugin.EventType.DoubleSwap) {
                 player.performCommand("gui");
@@ -124,7 +143,10 @@ public class ScriptRunner {
     }
 
     public static boolean callCommand(Player player, String command, String[] argsArray) {
-        CommandRegister commandRegister = COMMAND_MAP.getOrDefault(player, Collections.emptyMap()).get(command);
+        CommandRegister commandRegister = SWPlayer.of(player).getComponent(ScriptData.class)
+                .map(scriptData -> scriptData.commands)
+                .orElse(Collections.emptyMap())
+                .get(command);
         if (commandRegister == null) {
             return false;
         }
@@ -188,7 +210,11 @@ public class ScriptRunner {
 
     public static void callHotkey(int mods, int key, Player player, boolean pressed) {
         Hotkey hotkey = Hotkey.fromChar(key, mods);
-        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> HOTKEY_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(hotkey, Collections.emptyList()).forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
+        List<LuaFunction> hotkeys = SWPlayer.of(player).getComponent(ScriptData.class)
+                .map(scriptData -> scriptData.hotkeys)
+                .orElse(Collections.emptyMap())
+                .getOrDefault(hotkey, Collections.emptyList());
+        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> hotkeys.forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
     }
 
     public static void catchScript(String errorMsg, Player player, Runnable run) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/CommandListener.java

@@ -21,44 +21,24 @@ package de.steamwar.bausystem.features.script.event;
 
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 @Linked
 public class CommandListener implements Listener {
 
-    private Map<Player, Set<String>> calledCommands = new HashMap<>();
-
     @EventHandler
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
         String[] split = event.getMessage().split(" ");
-        if (calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).contains(split[0])) {
-            return;
-        }
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.getCalledCommands().contains(split[0])) return;
 
-        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).add(split[0]);
+        scriptData.getCalledCommands().add(split[0]);
         event.setCancelled(ScriptRunner.callCommand(event.getPlayer(), split[0].substring(1), split));
-        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).remove(split[0]);
-    }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        calledCommands.put(event.getPlayer(), new HashSet<>());
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        calledCommands.remove(event.getPlayer());
+        scriptData.getCalledCommands().remove(split[0]);
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java

@@ -25,6 +25,7 @@ import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
@@ -43,32 +44,27 @@ import org.bukkit.event.player.*;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 @Linked
 public class EventListener implements Listener {
 
-    private static final Map<Player, Long> LAST_FS = new HashMap<>();
-
     static {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             long millis = System.currentTimeMillis();
-            LAST_FS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
+            SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
+                    .filter(pair -> millis - pair.getComponent().getLastF() > 200)
+                    .forEach(pair -> pair.getComponent().setLastF(Long.MAX_VALUE));
         }, 1, 1);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfJoin, LuaValue.NIL, event);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerQuit(PlayerQuitEvent event) {
-        if(Permission.BUILD.hasPermission(event.getPlayer())) {
+        if (Permission.BUILD.hasPermission(event.getPlayer())) {
             ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
         }
         StorageLib.removePlayer(event.getPlayer());
@@ -76,19 +72,20 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (LAST_FS.containsKey(event.getPlayer())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.getLastF() != Long.MAX_VALUE) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DoubleSwap, LuaValue.NIL, event);
             }, 1);
         } else {
-            LAST_FS.put(event.getPlayer(), System.currentTimeMillis());
+            scriptData.setLastF(System.currentTimeMillis());
         }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         LuaTable table = new LuaTable();
         table.set("x", event.getBlock().getX());
         table.set("y", event.getBlock().getY());
@@ -99,7 +96,7 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockBreak(BlockBreakEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
         LuaTable table = new LuaTable();
         table.set("x", event.getBlock().getX());
         table.set("y", event.getBlock().getY());
@@ -108,12 +105,12 @@ public class EventListener implements Listener {
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.BreakBlock, table, event);
     }
 
-    private final Set<Player> ignore = new HashSet<>();
-
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (ignore.remove(event.getPlayer())) {
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (scriptData.isIgnore()) {
+            scriptData.setIgnore(false);
             return;
         }
         LuaTable table = new LuaTable();
@@ -124,7 +121,7 @@ public class EventListener implements Listener {
             table.set("hand", event.getHand().name());
         }
         table.set("block", event.getItem() == null ? Material.AIR.name() : event.getItem().getType().name());
-        if(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) {
+        if (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) {
             table.set("hasBlock", LuaValue.valueOf(true));
             table.set("blockX", event.getClickedBlock().getX());
             table.set("blockY", event.getClickedBlock().getY());
@@ -150,7 +147,7 @@ public class EventListener implements Listener {
         Region tntRegion = Region.getRegion(event.getLocation());
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
+            if (!Permission.BUILD.hasPermission(player)) continue;
             if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTSpawn, LuaValue.NIL, event);
             }
@@ -172,7 +169,7 @@ public class EventListener implements Listener {
         boolean inBuild = event.blockList().stream().anyMatch(block -> tntRegion.getBuildArea().inRegion(block.getLocation(), true));
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
+            if (!Permission.BUILD.hasPermission(player)) continue;
             if (tntRegion.getArea().inRegion(player.getLocation(), false)) {
                 ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.TNTExplode, table, event);
                 if (inBuild) {
@@ -184,8 +181,9 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ignore.add(event.getPlayer());
+        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        scriptData.setIgnore(true);
         LuaTable table = new LuaTable();
         table.set("type", event.getItemDrop().getItemStack().getType().name());
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DropItem, table, event);
@@ -194,7 +192,7 @@ public class EventListener implements Listener {
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDeath(EntityDeathEvent event) {
         for (Player player : Bukkit.getOnlinePlayers()) {
-            if(!Permission.BUILD.hasPermission(player)) continue;
+            if (!Permission.BUILD.hasPermission(player)) continue;
             LuaTable table = new LuaTable();
             table.set("type", event.getEntityType().name());
             ScriptRunner.callEvent(player, SteamWarGlobalLuaPlugin.EventType.EntityDeath, table, event);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/SteamWarLuaPlugin.java

@@ -48,6 +48,7 @@ import java.util.logging.Level;
 public class SteamWarLuaPlugin extends TwoArgFunction {
 
     private static final boolean hasFAWE = Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null;
+    private static final Set<String> ignoreCommandFromWorldEdit = Set.of("select", "schem", "/schem", "schematic", "/schematic");
 
     protected static final Map<Class<?>, List<LuaLib>> LUA_LIBS = new HashMap<>();
 
@@ -116,7 +117,7 @@ public class SteamWarLuaPlugin extends TwoArgFunction {
                 command = preprocessEvent.getMessage().substring(1);
                 Bukkit.getLogger().log(Level.INFO, player.getName() + " dispatched command: " + command);
                 String[] commandSplit = command.split(" ");
-                if (!commandSplit[0].equals("select") && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
+                if (!ignoreCommandFromWorldEdit.contains(commandSplit[0]) && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
                     EditSession editSession = WorldEditUtils.getEditSession(player);
                     Actor actor = BukkitAdapter.adapt(player);
                     WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().handleCommandOnCurrentThread(new CommandEvent(actor, command, editSession));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/RegionLib.java

@@ -59,14 +59,14 @@ public class RegionLib implements LuaLib {
         }));
 
         LuaValue tntLib = LuaValue.tableOf();
-        tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
-        tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
-        tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
+        tntLib.set("mode", getter(() -> region.get().getRegionData().get(Flag.TNT).nameWithDefault()));
+        tntLib.set("enabled", getter(() -> region.get().getRegionData().get(Flag.TNT).orElse(null) != TNTMode.DENY));
+        tntLib.set("onlyTb", getter(() -> region.get().getRegionData().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
         table.set("tnt", tntLib);
 
-        table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
-        table.set("freeze", getter(() -> region.get().getFlags().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
-        table.set("protect", getter(() -> region.get().getFlags().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
+        table.set("fire", getter(() -> region.get().getRegionData().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
+        table.set("freeze", getter(() -> region.get().getRegionData().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
+        table.set("protect", getter(() -> region.get().getRegionData().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
 
         //LuaValue traceLib = LuaValue.tableOf();
         //traceLib.set("active", getter(() -> !region.get().isGlobal() && Recorder.INSTANCE.get(region.get()) instanceof ActiveTracer));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/tnt/TNTPhase.java

@@ -65,7 +65,7 @@ public final class TNTPhase extends SimulatorPhase {
             @Override
             public void accept(World world) {
                 Location location = position.toLocation(world);
-                if (Region.getRegion(location).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
+                if (Region.getRegion(location).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
                 TNTPrimed tnt = world.spawn(location, TNTPrimed.class);
                 if (!xJump) tnt.setVelocity(tnt.getVelocity().setX(0));
                 if (!yJump) tnt.setVelocity(tnt.getVelocity().setY(0));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabFinalizer.java

@@ -35,8 +35,8 @@ public class StabFinalizer extends StabStep {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
+            if (data.region.getRegionData().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
             }
             data.region.getTestblockArea().reset(pasteBuilder, true);
         } catch (SecurityException e) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabGenerator.java

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
@@ -51,6 +52,7 @@ public class StabGenerator extends StabStep implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
         if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
             event.blockList().forEach(block -> {
                 if (!data.region.getTestblockArea().inRegion(block.getLocation(), true))
@@ -71,8 +73,8 @@ public class StabGenerator extends StabStep implements Listener {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
+            if (data.region.getRegionData().has(Flag.COLOR).isReadable()) {
+                pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
             }
             data.region.getTestblockArea().reset(pasteBuilder, true);
         } catch (SecurityException e) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverGui.java

@@ -150,11 +150,13 @@ public class SimulatorObserverGui extends SimulatorScrollGui<ObserverPhase> {
         Consumer<Integer> setter = observerPhase::setTickOffset;
         return new SWItem[] {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 observer,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverPhaseSettingsGui.java

@@ -32,6 +32,7 @@ import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -97,6 +98,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = observer.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(offset < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.min(max, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -113,6 +115,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -120,6 +123,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = observer.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -138,6 +142,7 @@ public class SimulatorObserverPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorObserverSettingsGui.java

@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -67,6 +68,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = observer.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -81,6 +83,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 observer.changeBaseTicks(-baseTicks);
             } else {
@@ -91,6 +94,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
 
         //Pos X
         inventory.setItem(15,  new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -102,12 +106,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -119,12 +125,14 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.ENABLED_OR_DISABLED));
@@ -136,6 +144,7 @@ public class SimulatorObserverSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             observer.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneGui.java

@@ -165,11 +165,13 @@ public class SimulatorRedstoneGui extends SimulatorScrollGui<SimulatorRedstoneGu
         Consumer<Integer> setter = redstoneSubPhase.place ? redstoneSubPhase.phase::setTickOffset : redstoneSubPhase.phase::setLifetime;
         return new SWItem[] {
                 new SWItem(SWItem.getDye(getter.get() < max ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.min(max, getter.get() + (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 redstone,
                 new SWItem(SWItem.getDye(getter.get() > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     setter.accept(Math.max(min, getter.get() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstonePhaseSettingsGui.java

@@ -31,6 +31,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -98,6 +99,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = redstone.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(offset < maxOffset ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.min(maxOffset, offset + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -114,6 +116,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > min ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setTickOffset(Math.max(min, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -121,6 +124,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Lifetime
         int lifetime = redstone.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(lifetime < maxLifetime ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.min(maxLifetime, lifetime + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -137,6 +141,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(20, lifetimeItem);
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setLifetime(Math.max(0, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -144,6 +149,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = redstone.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -162,6 +168,7 @@ public class SimulatorRedstonePhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorRedstoneSettingsGui.java

@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -66,6 +67,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = redstone.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -80,6 +82,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 redstone.changeBaseTicks(-baseTicks);
             } else {
@@ -90,6 +93,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
 
         //Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? 5 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -101,12 +105,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(clickType.isShiftClick() ? -5 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? 5 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -118,12 +124,14 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, clickType.isShiftClick() ? -5 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -135,6 +143,7 @@ public class SimulatorRedstoneSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             redstone.move(0, 0, clickType.isShiftClick() ? -5 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java

@@ -138,11 +138,13 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
 
         return new SWItem[]{
                 new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8:§e +5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(tntSetting.getCount() + (clickType.isShiftClick() ? 5 : 1));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED),
                 tnt,
                 new SWItem(SWItem.getDye(tntSetting.getCount() > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8:§e -5"), false, clickType -> {
+                    if (clickType == ClickType.DOUBLE_CLICK) return;
                     tntSetting.setCount(Math.max(1, tntSetting.getCount() - (clickType.isShiftClick() ? 5 : 1)));
                     SimulatorWatcher.update(simulator);
                 }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED),

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTPhaseSettingsGui.java

@@ -31,6 +31,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.Arrays;
 
@@ -78,6 +79,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Count
         int count = tnt.getCount();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(count + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -94,6 +96,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(18, countItem);
 
         inventory.setItem(27, new SWItem(SWItem.getDye(count > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -101,6 +104,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Tick Offset
         int offset = tnt.getTickOffset();
         inventory.setItem(10, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -117,6 +121,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(19, offsetItem);
 
         inventory.setItem(28, new SWItem(SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setTickOffset(Math.max(0, offset - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -124,6 +129,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Lifetime
         int lifetime = tnt.getLifetime();
         inventory.setItem(11, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -140,6 +146,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(20, lifetimeItem);
 
         inventory.setItem(29, new SWItem(SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
@@ -147,6 +154,7 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         //Order
         int order = tnt.getOrder();
         inventory.setItem(13, new SWItem(SWItem.getDye(order < SimulatorPhase.ORDER_LIMIT ? 10 : 8), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.min(SimulatorPhase.ORDER_LIMIT, order + (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -165,30 +173,35 @@ public class SimulatorTNTPhaseSettingsGui extends SimulatorBaseGui {
         inventory.setItem(22, orderItem);
 
         inventory.setItem(31, new SWItem(SWItem.getDye(order > -SimulatorPhase.ORDER_LIMIT ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setOrder(Math.max(-SimulatorPhase.ORDER_LIMIT, order - (clickType.isShiftClick() ? 5 : 1)));
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         //Jump
         SWItem jumpX = new SWItem(tnt.isXJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump X§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setXJump(!tnt.isXJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(33, jumpX);
 
         SWItem jumpY = new SWItem(tnt.isYJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Y§8: " + (tnt.isYJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setYJump(!tnt.isYJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(16, jumpY);
 
         SWItem jumpZ = new SWItem(tnt.isZJump() ? Material.LIME_WOOL : Material.RED_WOOL, "§7TNT §eJump Z§8: " + (tnt.isZJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setZJump(!tnt.isZJump());
             SimulatorWatcher.update(simulator);
         });
         inventory.setItem(35, jumpZ);
 
         SWItem jumpAll = new SWItem(Material.TNT, "§7TNT §eJump §8: " + (tnt.hasJump() ? "§aon" : "§coff"), clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.setJump(!tnt.hasJump());
             SimulatorWatcher.update(simulator);
         });

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTSettingsGui.java

@@ -28,6 +28,7 @@ import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -75,6 +76,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         // Base Tick
         int baseTicks = tnt.getBaseTick();
         inventory.setItem(9, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.changeBaseTicks(clickType.isShiftClick() ? 5 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -89,6 +91,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
         baseTick.getItemStack().setAmount(Math.max(1, Math.min(baseTicks, 64)));
         inventory.setItem(18, baseTick);
         inventory.setItem(27, new SWItem(SWItem.getDye(baseTicks > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             if (baseTicks - (clickType.isShiftClick() ? 5 : 1) < 0) {
                 tnt.changeBaseTicks(-baseTicks);
             } else {
@@ -136,6 +139,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
 
         // Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? 0.0625 : 1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -147,12 +151,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(33, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(clickType.isShiftClick() ? -0.0625 : -1, 0, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Y
         inventory.setItem(16, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? 0.0625 : 1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -164,12 +170,14 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(34, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, clickType.isShiftClick() ? -0.0625 : -1, 0);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));
 
         // Pos Z
         inventory.setItem(17, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? 0.0625 : 1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.INCREMENT_OR_DISABLED));
@@ -181,6 +189,7 @@ public class SimulatorTNTSettingsGui extends SimulatorBaseGui {
             }, this).open();
         }));
         inventory.setItem(35, new SWItem(SWItem.getDye(1), "§e-1", Arrays.asList("§7Shift§8: §e-0.0625"), false, clickType -> {
+            if (clickType == ClickType.DOUBLE_CLICK) return;
             tnt.move(0, 0, clickType.isShiftClick() ? -0.0625 : -1);
             SimulatorWatcher.update(simulator);
         }).setCustomModelData(CMDs.Simulator.DECREMENT_OR_DISABLED));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/BlockBoundingBox.java

@@ -101,7 +101,7 @@ public class BlockBoundingBox {
         addPixel(Material.END_STONE.createBlockData(), 0, 0, 0, 16, 16, 16, null);
 
         addPixel(NMSWrapper.impl.pathMaterial().createBlockData(), 0, 0, 0, 16, 15, 16, createItem("LAUFBAU_BLOCK_GRASS_PATH", NMSWrapper.impl.pathMaterial()));
-        addPixel(Material.SOUL_SAND.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
+        addPixel(Material.MUD.createBlockData(), 0, 0, 0, 16, 14, 16, createItem("LAUFBAU_BLOCK_SOUL_SAND", Material.SOUL_SAND));
 
         Cocoa cocoaNorth = (Cocoa) Material.COCOA.createBlockData();
         cocoaNorth.setAge(2);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauCommand.java

@@ -25,12 +25,14 @@ import de.steamwar.bausystem.shared.Pair;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
 @Linked
+@MinVersion(19)
 public class LaufbauCommand extends SWCommand {
 
     public LaufbauCommand() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/LaufbauUtils.java

@@ -20,17 +20,14 @@
 package de.steamwar.bausystem.features.slaves.laufbau;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWItem;
-import de.steamwar.linkage.Linked;
 import de.steamwar.sql.UserConfig;
 import lombok.Cleanup;
 import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.meta.ItemMeta;
 import yapion.hierarchy.output.StreamOutput;
 import yapion.hierarchy.types.YAPIONObject;
@@ -39,44 +36,45 @@ import yapion.parser.options.StreamOptions;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-@Linked
-public class LaufbauUtils implements Listener {
+@UtilityClass
+public class LaufbauUtils {
 
-    private static Map<Player, YAPIONObject> yapionObjectMap = new HashMap<>();
+    public static class LaufbauComponent implements SWPlayer.Component {
 
-    @EventHandler
-    @SneakyThrows
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        String config = UserConfig.getConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
-        if (config == null) {
-            return;
-        }
-        byte[] bytes = Base64.getDecoder().decode(config);
-        @Cleanup GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(bytes));
-        YAPIONObject yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
-        yapionObjectMap.put(event.getPlayer(), yapionObject);
-    }
+        private YAPIONObject yapionObject = new YAPIONObject();
 
-    @EventHandler
-    @SneakyThrows
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        YAPIONObject yapionObject = yapionObjectMap.get(event.getPlayer());
-        if (yapionObject == null) {
-            return;
+        @Override
+        @SneakyThrows
+        public void onMount(SWPlayer player) {
+            String config = UserConfig.getConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
+            if (config == null) {
+                return;
+            }
+            byte[] bytes = Base64.getDecoder().decode(config);
+            @Cleanup GZIPInputStream gzipInputStream = new GZIPInputStream(new ByteArrayInputStream(bytes));
+            yapionObject = new YAPIONParser(gzipInputStream, new StreamOptions().stopOnStreamEnd(true)).parse().result();
         }
-        if (yapionObject.isEmpty()) {
-            UserConfig.removePlayerConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
-            return;
+
+        @Override
+        @SneakyThrows
+        public void onUnmount(SWPlayer player) {
+            if (yapionObject.isEmpty()) {
+                UserConfig.removePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
+                return;
+            }
+            @Cleanup ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            @Cleanup GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
+            yapionObject.toYAPION(new StreamOutput(gzipOutputStream)).close();
+            UserConfig.updatePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau", Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()));
         }
-        @Cleanup ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        @Cleanup GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
-        yapionObject.toYAPION(new StreamOutput(gzipOutputStream)).close();
-        UserConfig.updatePlayerConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau", Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray()));
     }
 
     public static Cuboid pixelCuboid(double pixelX, double pixelY, double pixelZ, double pixelDX, double pixelDY, double pixelDZ) {
@@ -125,11 +123,7 @@ public class LaufbauUtils implements Listener {
             return false;
         }
         String identifier = identifier(bb);
-        YAPIONObject yapionObject = yapionObjectMap.get(p);
-        if (yapionObject == null) {
-            return false;
-        }
-        return yapionObject.containsKey(identifier);
+        return SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject.containsKey(identifier);
     }
 
     @SneakyThrows
@@ -138,11 +132,7 @@ public class LaufbauUtils implements Listener {
             return;
         }
         String identifier = identifier(bb);
-        YAPIONObject yapionObject = yapionObjectMap.get(p);
-        if (yapionObject == null) {
-            yapionObject = new YAPIONObject();
-            yapionObjectMap.put(p, yapionObject);
-        }
+        YAPIONObject yapionObject = SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject;
         if (yapionObject.containsKey(identifier)) {
             yapionObject.remove(identifier);
         } else {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/techhider/TechHiderCommand.java

@@ -107,7 +107,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             @Override
             public Player map(CommandSender commandSender, String[] previousArguments, String s) {
                 Player player = Bukkit.getPlayer(s);
-                if (player != null && Permission.REAL_SPECTATOR.hasPermission(player)) {
+                if (player != null && Permission.SPECTATOR.hasPermission(player)) {
                     return player;
                 }
                 return null;
@@ -116,7 +116,7 @@ public class TechHiderCommand extends SWCommand implements Listener, ScoreboardE
             @Override
             public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
                 return Bukkit.getOnlinePlayers().stream()
-                        .filter(Permission.REAL_SPECTATOR::hasPermission)
+                        .filter(Permission.SPECTATOR::hasPermission)
                         .map(Player::getName)
                         .collect(Collectors.toList());
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/testblock/blockcounter/BlockCounterListener.java

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.testblock.blockcounter;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.linkage.Linked;
 import org.bukkit.block.Block;
+import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -34,6 +35,7 @@ public class BlockCounterListener implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof TNTPrimed)) return;
         Region region = Region.getRegion(event.getLocation());
         if (region.getType().isGlobal()) {
             return;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSCommand.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tntlistener;
+package de.steamwar.bausystem.features.tls;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -43,4 +43,13 @@ public class TLSCommand extends SWCommand {
     public void stop(@Validator Player player) {
         listener.stopListening(player);
     }
+
+    @Register(description = "TLS_TOGGLE_HELP")
+    public void toggle(@Validator Player player) {
+        if (listener.isActiveFor(player)) {
+            listener.stopListening(player);
+        } else {
+            listener.startListening(player);
+        }
+    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSListener.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tntlistener;
+package de.steamwar.bausystem.features.tls;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tls/TLSScoreboardElement.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tntlistener;
+package de.steamwar.bausystem.features.tls;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;

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

@@ -45,8 +45,6 @@ public class TraceManager implements Listener {
         instance = this;
     }
 
-
-
     public void init() {
         if (!tracesFolder.exists())
             tracesFolder.mkdir();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/GamemodeCommand.java

@@ -20,6 +20,7 @@ package de.steamwar.bausystem.features.util;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.command.SWCommand;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -39,10 +40,11 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void genericCommand(final Player p) {
-		if (NoClipCommand.getNOCLIPS().contains(p)) {
-			p.performCommand("noclip");
-			return;
-		}
+        SWPlayer swPlayer = SWPlayer.of(p);
+        if (swPlayer.hasComponent(NoClipCommand.NoClipData.class)) {
+            swPlayer.removeComponent(NoClipCommand.NoClipData.class);
+            return;
+        }
 		if (p.getGameMode() == GameMode.CREATIVE) {
 			p.setGameMode(GameMode.SPECTATOR);
 		} else {
@@ -52,9 +54,7 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void gamemodeCommand(final Player p, final GameMode gameMode) {
-		if (NoClipCommand.getNOCLIPS().contains(p)) {
-			p.performCommand("noclip");
-		}
+        SWPlayer.of(p).removeComponent(NoClipCommand.NoClipData.class);
 		p.setGameMode(gameMode);
 	}
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialCommand.java

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.shared.EnumDisplay;
 import de.steamwar.command.PreviousArguments;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.TypeMapper;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.data.CMDs;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWInventory;
@@ -56,11 +57,9 @@ public class MaterialCommand extends SWCommand implements Listener {
         WorldEditListener.addCommandExclusion("material");
     }
 
-    private Map<Player, Search> searchMap = new HashMap<>();
-
     @Getter
     @Setter
-    static class Search {
+    public class SearchParameter implements SWPlayer.Component {
         SearchType transparent = SearchType.IGNORE;
         SearchType solid = SearchType.IGNORE;
         SearchType gravity = SearchType.IGNORE;
@@ -104,10 +103,10 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void materialGUI(Player p) {
-        materialGUI(p, searchMap.get(p));
+        materialGUI(p, SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new));
     }
 
-    private static final Map<String, BiConsumer<Search, SearchType>> elements = new HashMap<>();
+    private static final Map<String, BiConsumer<SearchParameter, SearchType>> elements = new HashMap<>();
     static {
         elements.put("-transparent", (search, searchType) -> search.transparent = searchType);
         elements.put("-solid", (search, searchType) -> search.solid = searchType);
@@ -122,15 +121,15 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void search(Player p, @Mapper("search") String... searches) {
-        Search search = new Search();
+        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
         for (String s : searches) {
             boolean has = false;
-            for (Map.Entry<String, BiConsumer<Search, SearchType>> element: elements.entrySet()) {
+            for (Map.Entry<String, BiConsumer<SearchParameter, SearchType>> element: elements.entrySet()) {
                 if (s.startsWith(element.getKey() + ":")) {
-                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
+                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
                     has = true;
                 } else if (s.startsWith(element.getKey().substring(0, 2) + ":")) {
-                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
+                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
                     has = true;
                 }
                 if (has) break;
@@ -141,15 +140,15 @@ public class MaterialCommand extends SWCommand implements Listener {
                 case "-blastresistance:":
                     s = s.substring(s.indexOf(':') + 1).replace('_', ' ');
                     if (s.isEmpty() || s.matches("((([><]=?)|!|=)\\d+(\\.|,\\d+)?)( ((([><]=?)|!|=)\\d+(\\.|,\\d+)?))*")) {
-                        search.blastResistance = s;
+                        searchParameter.blastResistance = s;
                     }
                     break;
                 default:
-                    search.name = s;
+                    searchParameter.name = s;
                     break;
             }
         }
-        materialGUI(p, search);
+        materialGUI(p, searchParameter);
     }
 
     @Mapper(value = "search", local = true)
@@ -182,7 +181,7 @@ public class MaterialCommand extends SWCommand implements Listener {
         };
     }
 
-    public void materialGUI(Player p, Search search) {
+    public void materialGUI(Player p, SearchParameter search) {
         List<SWListInv.SWListEntry<Material>> swListEntries = new ArrayList<>();
         MaterialLazyInit.materialData.forEach(data -> {
             if (data.is(search)) {
@@ -202,59 +201,59 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     private void searchGUI(Player p) {
         SWInventory swInventory = new SWInventory(p, 54, BauSystem.MESSAGE.parse("MATERIAL_SEARCH", p));
-        Search search = searchMap.get(p);
+        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
         swInventory.setItem(0, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("MATERIAL_BACK", p), clickType -> {
             materialGUI(p);
         }).setCustomModelData(CMDs.BACK));
-        swInventory.setItem(10, new SWItem(Material.NAME_TAG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, search.name), clickType -> {
-            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), search.name);
+        swInventory.setItem(10, new SWItem(Material.NAME_TAG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, searchParameter.name), clickType -> {
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), searchParameter.name);
             swAnvilInv.setCallback(s -> {
-                search.name = s;
+                searchParameter.name = s;
                 searchGUI(p);
             });
             swAnvilInv.open();
         }));
-        swInventory.setItem(19, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_TRANSPARENT", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.transparent.getChatValue(), p)), clickType -> {
-            search.transparent = search.transparent.next();
+        swInventory.setItem(19, new SWItem(Material.GLASS, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_TRANSPARENT", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.transparent.getChatValue(), p)), clickType -> {
+            searchParameter.transparent = searchParameter.transparent.next();
             searchGUI(p);
         }));
-        swInventory.setItem(20, new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_SOLID", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.solid.getChatValue(), p)), clickType -> {
-            search.solid = search.solid.next();
+        swInventory.setItem(20, new SWItem(Material.BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_SOLID", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.solid.getChatValue(), p)), clickType -> {
+            searchParameter.solid = searchParameter.solid.next();
             searchGUI(p);
         }));
-        swInventory.setItem(21, new SWItem(Material.BLACK_CONCRETE_POWDER, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_GRAVITY", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.gravity.getChatValue(), p)), clickType -> {
-            search.gravity = search.gravity.next();
+        swInventory.setItem(21, new SWItem(Material.BLACK_CONCRETE_POWDER, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_GRAVITY", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.gravity.getChatValue(), p)), clickType -> {
+            searchParameter.gravity = searchParameter.gravity.next();
             searchGUI(p);
         }));
-        swInventory.setItem(22, new SWItem(Material.BIRCH_LOG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_OCCLUDING", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.occluding.getChatValue(), p)), clickType -> {
-            search.occluding = search.occluding.next();
+        swInventory.setItem(22, new SWItem(Material.BIRCH_LOG, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_OCCLUDING", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.occluding.getChatValue(), p)), clickType -> {
+            searchParameter.occluding = searchParameter.occluding.next();
             searchGUI(p);
         }));
-        swInventory.setItem(23, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_INTERACTEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.interacteable.getChatValue(), p)), clickType -> {
-            search.interacteable = search.interacteable.next();
+        swInventory.setItem(23, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_INTERACTEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.interacteable.getChatValue(), p)), clickType -> {
+            searchParameter.interacteable = searchParameter.interacteable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(24, new SWItem(Material.FLINT_AND_STEEL, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_FLAMMABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.flammable.getChatValue(), p)), clickType -> {
-            search.flammable = search.flammable.next();
+        swInventory.setItem(24, new SWItem(Material.FLINT_AND_STEEL, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_FLAMMABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.flammable.getChatValue(), p)), clickType -> {
+            searchParameter.flammable = searchParameter.flammable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(25, new SWItem(Material.LAVA_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BURNABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.burnable.getChatValue(), p)), clickType -> {
-            search.burnable = search.burnable.next();
+        swInventory.setItem(25, new SWItem(Material.LAVA_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BURNABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.burnable.getChatValue(), p)), clickType -> {
+            searchParameter.burnable = searchParameter.burnable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(28, new SWItem(Material.WATER_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_WATERLOGGABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.waterloggable.getChatValue(), p)), clickType -> {
-            search.waterloggable = search.waterloggable.next();
+        swInventory.setItem(28, new SWItem(Material.WATER_BUCKET, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_WATERLOGGABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.waterloggable.getChatValue(), p)), clickType -> {
+            searchParameter.waterloggable = searchParameter.waterloggable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(29, new SWItem(Material.PISTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_UNMOVEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(search.unmoveable.getChatValue(), p)), clickType -> {
-            search.unmoveable = search.unmoveable.next();
+        swInventory.setItem(29, new SWItem(Material.PISTON, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_UNMOVEABLE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, BauSystem.MESSAGE.parse(searchParameter.unmoveable.getChatValue(), p)), clickType -> {
+            searchParameter.unmoveable = searchParameter.unmoveable.next();
             searchGUI(p);
         }));
-        swInventory.setItem(34, new SWItem(Material.NETHER_BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, search.blastResistance), clickType -> {
-            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p), search.blastResistance);
+        swInventory.setItem(34, new SWItem(Material.NETHER_BRICK, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p) + BauSystem.MESSAGE.parse("MATERIAL_SEARCH_VALUE", p, searchParameter.blastResistance), clickType -> {
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p), searchParameter.blastResistance);
             swAnvilInv.setCallback(s -> {
                 if (s.isEmpty() || s.matches("((([><]=?)|!|=)\\d+(\\.|,\\d+)?)( ((([><]=?)|!|=)\\d+(\\.|,\\d+)?))*")) {
-                    search.blastResistance = s;
+                    searchParameter.blastResistance = s;
                 }
                 searchGUI(p);
             });
@@ -262,14 +261,4 @@ public class MaterialCommand extends SWCommand implements Listener {
         }));
         swInventory.open();
     }
-
-    @EventHandler
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        searchMap.put(event.getPlayer(), new Search());
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        searchMap.remove(event.getPlayer());
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/MaterialLazyInit.java

@@ -133,7 +133,7 @@ public class MaterialLazyInit {
             }), originalMaterial);
         }
 
-        public boolean is(MaterialCommand.Search search) {
+        public boolean is(MaterialCommand.SearchParameter search) {
             boolean result = true;
             result &= search.transparent.test(transparent);
             result &= search.solid.test(solid);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java

@@ -19,17 +19,17 @@
 
 package de.steamwar.bausystem.features.util;
 
-import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.ProtocolWrapper;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
-import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -40,10 +40,6 @@ import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.function.BiFunction;
 
 @Linked
@@ -59,29 +55,34 @@ public class NoClipCommand extends SWCommand implements Listener {
     private static final Class<?> windowClick = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundContainerClickPacket");
     private static final Class<?> setSlotStack = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket");
 
-    @Getter
-    private static final List<Player> NOCLIPS = new ArrayList<>();
-    private static final Map<Player, Long> LAST_TICKS = new HashMap<>();
+    public static class NoClipData implements SWPlayer.Component {
+        private long lastTick = -1;
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            player.setGameMode(GameMode.CREATIVE);
+        }
+    }
 
     public NoClipCommand() {
         super("noclip", "nc");
 
         BiFunction<Player, Object, Object> first = (player, o) -> {
-            if (NOCLIPS.contains(player)) {
-                if (LAST_TICKS.getOrDefault(player, -1L).equals(TPSUtils.currentTick.get())) return o;
-                NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
-                LAST_TICKS.put(player, TPSUtils.currentTick.get());
-            }
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
+            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
+            NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
+            noClipData.lastTick = TPSUtils.currentTick.get();
             return o;
         };
         TinyProtocol.instance.addFilter(position, first);
         TinyProtocol.instance.addFilter(positionLook, first);
 
         BiFunction<Player, Object, Object> second = (player, o) -> {
-            if (NOCLIPS.contains(player)) {
-                NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
-                LAST_TICKS.put(player, TPSUtils.currentTick.get());
-            }
+            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (noClipData == null) return o;
+            NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
+            noClipData.lastTick = TPSUtils.currentTick.get();
             return o;
         };
         TinyProtocol.instance.addFilter(useItem, second);
@@ -89,7 +90,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         TinyProtocol.instance.addFilter(windowClick, second);
 
         BiFunction<Player, Object, Object> third = (player, o) -> {
-            if (NOCLIPS.contains(player)) {
+            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
                 NMSWrapper.impl.setSlotToItemStack(player, o);
             }
             return o;
@@ -99,9 +100,9 @@ public class NoClipCommand extends SWCommand implements Listener {
 
     @Register(help = true)
     public void genericCommand(@Validator Player player) {
-        if (NOCLIPS.contains(player)) {
-            NOCLIPS.remove(player);
-            player.setGameMode(GameMode.CREATIVE);
+        SWPlayer swPlayer = SWPlayer.of(player);
+        if (swPlayer.hasComponent(NoClipData.class)) {
+            swPlayer.removeComponent(NoClipData.class);
         } else {
             player.setGameMode(GameMode.SPECTATOR);
             NMSWrapper.impl.setPlayerBuildAbilities(player);
@@ -109,8 +110,8 @@ public class NoClipCommand extends SWCommand implements Listener {
             Object gameStateChangeObject = Reflection.newInstance(gameStateChange);
             NMSWrapper.impl.setGameStateChangeReason(gameStateChangeObject);
             floatFieldAccessor.set(gameStateChangeObject, 1F);
-            
-            NOCLIPS.add(player);
+
+            swPlayer.setComponent(new NoClipData());
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
             TinyProtocol.instance.sendPacket(player, gameStateChangeObject);
             pseudoGameMode(player, GameMode.SPECTATOR);
@@ -120,30 +121,27 @@ public class NoClipCommand extends SWCommand implements Listener {
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
         event.getNewSpectator().forEach(player -> {
-            if (NOCLIPS.contains(player)) {
-                NOCLIPS.remove(player);
-                player.setGameMode(GameMode.CREATIVE);
-            }
+            SWPlayer.of(player).removeComponent(NoClipData.class);
         });
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setBuildable(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
             event.getPlayer().setFlying(true);
         }
@@ -154,7 +152,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
             return;
         }
-        if (NOCLIPS.contains(event.getPlayer())) {
+        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 event.getPlayer().setSpectatorTarget(null);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/SelectBauGuiItem.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.linkage.BauGuiItem;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
@@ -35,15 +36,11 @@ import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 @Linked
 public class SelectBauGuiItem extends BauGuiItem {
 
-    private static final Map<Player, LastSelect> LAST_SELECT_MAP = new HashMap<>();
-
     public SelectBauGuiItem() {
         super(13);
     }
@@ -58,13 +55,13 @@ public class SelectBauGuiItem extends BauGuiItem {
 
     private static void selectFinish(Player p, RegionType type, RegionExtensionType extensionType) {
         p.closeInventory();
-        LAST_SELECT_MAP.put(p, new LastSelect(type, extensionType));
+        SWPlayer.of(p).setComponent(new LastSelect(type, extensionType));
         p.performCommand("select " + type.name() + " " + extensionType.toString());
     }
 
     @Override
     public ItemStack getItem(Player player) {
-        LastSelect last = LAST_SELECT_MAP.getOrDefault(player, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+        LastSelect last = SWPlayer.of(player).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
         return new SWItem(Material.SCAFFOLDING, BauSystem.MESSAGE.parse("SELECT_ITEM_SELECT", player), Arrays.asList(BauSystem.MESSAGE.parse("SELECT_ITEM_AUSWAHL", player, BauSystem.MESSAGE.parse(last.type.getChatValue(), player), last.extensionType.name()), BauSystem.MESSAGE.parse("SELECT_ITEM_RIGHT_CLICK", player)), false, clickType -> {
         }).getItemStack();
     }
@@ -80,7 +77,7 @@ public class SelectBauGuiItem extends BauGuiItem {
             inv.open();
         } else {
             p.closeInventory();
-            LastSelect last = LAST_SELECT_MAP.getOrDefault(p, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+            LastSelect last = SWPlayer.of(p).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
             p.performCommand("select " + last.getType().name() + " " + last.getExtensionType().toString());
         }
         return false;
@@ -92,7 +89,7 @@ public class SelectBauGuiItem extends BauGuiItem {
     }
 
     @AllArgsConstructor
-    private static class LastSelect {
+    private static class LastSelect implements SWPlayer.Component {
         @Getter
         private final RegionType type;
         @Getter

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

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.warp;
 
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.core.Core;
+import de.steamwar.core.SWPlayer;
 import de.steamwar.entity.RArmorStand;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.linkage.Linked;
@@ -30,7 +31,10 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerToggleSneakEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
@@ -42,8 +46,21 @@ import java.util.Map;
 @Linked
 public class WarpListener implements Listener {
 
-    private Map<Player, REntityServer> warpEntityServer = new HashMap<>();
-    private Map<Player, List<Location>> selected = new HashMap<>();
+    public static class WarpComponent implements SWPlayer.Component {
+        private REntityServer server;
+        private List<Location> selected = new ArrayList<>();
+
+        @Override
+        public void onMount(SWPlayer player) {
+            server = new REntityServer();
+            server.addPlayer(player.getPlayer());
+        }
+
+        @Override
+        public void onUnmount(SWPlayer player) {
+            server.close();
+        }
+    }
 
     @EventHandler
     public void onPlayerItemHeld(PlayerItemHeldEvent e) {
@@ -65,20 +82,11 @@ public class WarpListener implements Listener {
     }
 
     private void reshow(Player p, Material material, boolean sneaking) {
-        REntityServer entityServer = warpEntityServer.get(p);
-        if (entityServer != null) {
-            entityServer.close();
-        }
-        if (material != Material.COMPASS) {
-            warpEntityServer.remove(p);
-            return;
-        }
-
-        selected.remove(p);
-        entityServer = new REntityServer();
-        entityServer.addPlayer(p);
-        warpEntityServer.put(p, entityServer);
+        SWPlayer swPlayer = SWPlayer.of(p);
+        swPlayer.removeComponent(WarpComponent.class);
+        if (material != Material.COMPASS) return;
 
+        WarpComponent warpComponent = swPlayer.getComponentOrDefault(WarpComponent.class, WarpComponent::new);
         Vector current = p.getLocation().clone().add(p.getLocation().getDirection().multiply(5)).toVector();
 
         Map<String, Location> locations = new HashMap<>();
@@ -99,12 +107,9 @@ public class WarpListener implements Listener {
             }
         }
 
-        REntityServer finalEntityServer = entityServer;
         locations.forEach((name, location) -> {
             Vector vector = location.toVector().subtract(p.getLocation().toVector());
-            if (vector.getX() * vector.getX() + vector.getZ() * vector.getZ() < 25) {
-                return;
-            }
+            if (vector.getX() * vector.getX() + vector.getZ() * vector.getZ() < 25) return;
             vector.setY(0);
 
             Vector position = p.getLocation().toVector().clone().add(vector.normalize().multiply(5));
@@ -112,9 +117,9 @@ public class WarpListener implements Listener {
 
             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);
+                warpComponent.selected.add(location);
             }
-            RArmorStand armorStand = new RArmorStand(finalEntityServer, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
+            RArmorStand armorStand = new RArmorStand(warpComponent.server, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
             armorStand.setDisplayName(name);
             armorStand.setNoGravity(true);
             armorStand.setInvisible(true);
@@ -123,28 +128,13 @@ public class WarpListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerInteract(PlayerInteractEvent event) {
-        if (event.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) {
-            return;
-        }
-        if (event.getAction() != Action.RIGHT_CLICK_AIR) {
-            return;
-        }
-        List<Location> locations = selected.getOrDefault(event.getPlayer(), new ArrayList<>());
-        if (locations.size() != 1) {
-            return;
-        }
-        Location location = locations.get(0);
+        if (event.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) return;
+        if (event.getAction() != Action.RIGHT_CLICK_AIR) return;
+        WarpComponent warpComponent = SWPlayer.of(event.getPlayer()).getComponent(WarpComponent.class).orElse(null);
+        if (warpComponent == null || warpComponent.selected.size() != 1) return;
+        Location location = warpComponent.selected.get(0);
         event.getPlayer().teleport(location);
         event.getPlayer().playSound(location, Sound.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1, 1);
         event.setCancelled(true);
     }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        warpEntityServer.computeIfPresent(event.getPlayer(), (player, rEntityServer) -> {
-            rEntityServer.close();
-            return null;
-        });
-        selected.remove(event.getPlayer());
-    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauMemberUpdate.java

@@ -59,18 +59,14 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
         Set<Player> newSpectator = new HashSet<>();
         Set<Player> newBuilder = new HashSet<>();
         Bukkit.getOnlinePlayers().forEach(player -> {
-            if (Permission.REAL_SPECTATOR.hasPermission(player)) {
+            if (Permission.SPECTATOR.hasPermission(player)) {
                 if (!SPECTATORS.contains(player)) {
                     SPECTATORS.add(player);
-                    Permission.removeForceOnlySpectator(player);
                     newSpectator.add(player);
                     player.addPotionEffect(new PotionEffect(PotionEffectType.GLOWING, -1, 1, false,false, false));
                     showSpectatorNotice(player);
                 }
             } else {
-                if (Permission.SUPERVISOR.hasPermission(player)) {
-                    Permission.removeForceOnlySpectator(player);
-                }
                 if (SPECTATORS.contains(player)) {
                     SPECTATORS.remove(player);
                     newBuilder.add(player);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/BauScoreboard.java

@@ -121,8 +121,8 @@ public class BauScoreboard implements Listener {
                 Region region = Region.getRegion(player.getLocation());
                 if (region.getType().isGlobal()) return "§eSteam§8War";
                 String colorCode = "§e";
-                if (region.getFlags().has(Flag.COLOR).isReadable()) {
-                    colorCode = "§" + region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK).getColorCode();
+                if (region.getRegionData().has(Flag.COLOR).isReadable()) {
+                    colorCode = "§" + region.getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK).getColorCode();
                 }
                 return colorCode + "■ §eSteam§8War " + colorCode + "■"; // ■
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/OtherTNTListener.java

@@ -1,43 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.world;
-
-import de.steamwar.linkage.Linked;
-import org.bukkit.Material;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityExplodeEvent;
-
-@Linked
-public class OtherTNTListener implements Listener {
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onExplosion(EntityExplodeEvent e) {
-        e.blockList().removeIf(block -> {
-            if(block.getType() == Material.TNT) {
-                return false;
-            } else {
-                block.setType(Material.AIR);
-                return true;
-            }
-        });
-    }
-}

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

@@ -49,6 +49,7 @@ import java.util.Set;
 @Linked
 public class SpectatorListener implements Listener {
 
+    private static final TechHider techHider;
     private static final Set<Player> NO_TECHHIDER = new HashSet<>();
 
     static {
@@ -100,10 +101,20 @@ public class SpectatorListener implements Listener {
         materials.add(Material.WATER);
         materials.remove(Material.BARRIER);
         materials.remove(Material.STONE);
-        TechHider techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
-            return Permission.BUILD.hasPermission(player) || Permission.isTempOnlySpectator(player) || NO_TECHHIDER.contains(player);
+        techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
+            return Permission.BUILD.hasPermission(player) || NO_TECHHIDER.contains(player);
         }, Material.END_STONE, materials, new HashSet<>());
-        techHider.enable();
+    }
+
+    private static void enableOrDisableTechhider() {
+        boolean enable = Bukkit.getOnlinePlayers()
+                .stream()
+                .anyMatch(player -> !(Permission.BUILD.hasPermission(player) || NO_TECHHIDER.contains(player)));
+        if (enable) {
+            techHider.enable();
+        } else {
+            techHider.disable();
+        }
     }
 
     public static void toggleNoTechHider(Player player) {
@@ -113,6 +124,7 @@ public class SpectatorListener implements Listener {
             NO_TECHHIDER.add(player);
         }
         resendChunks(player);
+        enableOrDisableTechhider();
     }
 
     private static void resendChunks(Player player) {
@@ -131,6 +143,7 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
+        enableOrDisableTechhider();
         if (BauSystem.DEV_SERVER) return;
         if (event.getPlayer().getUniqueId().equals(BauServer.getInstance().getOwner())) {
             return;
@@ -152,6 +165,7 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        enableOrDisableTechhider();
         if (!anySupervisorOnline(null) && !BauSystem.DEV_SERVER) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 player.kickPlayer("");
@@ -161,7 +175,6 @@ public class SpectatorListener implements Listener {
 
         event.getChanged().forEach(player -> {
             NO_TECHHIDER.remove(player);
-            if (Permission.isTempOnlySpectator(player)) return;
             resendChunks(player);
         });
     }
@@ -169,6 +182,7 @@ public class SpectatorListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         NO_TECHHIDER.remove(event.getPlayer());
+        Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), SpectatorListener::enableOrDisableTechhider, 1);
         if (BauSystem.DEV_SERVER) return;
         if (!anySupervisorOnline(event.getPlayer())) {
             Bukkit.getOnlinePlayers().forEach(player -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/SelectAdjacent.java

@@ -1,194 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.features.worldedit;
-
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.Point;
-import de.steamwar.bausystem.region.Region;
-import de.steamwar.bausystem.utils.FlatteningWrapper;
-import de.steamwar.core.WorldEditRenderer;
-import de.steamwar.linkage.Linked;
-import de.steamwar.linkage.MinVersion;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.util.Vector;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
-
-@Linked
-@MinVersion(20)
-public class SelectAdjacent implements Listener {
-
-    private Vector[] FACES = {
-            new Vector(1, 0, 0),
-            new Vector(-1, 0, 0),
-            new Vector(0, 1, 0),
-            new Vector(0, -1, 0),
-            new Vector(0, 0, 1),
-            new Vector(0, 0, -1),
-
-            new Vector(1, 1, 0),
-            new Vector(1, -1, 0),
-            new Vector(1, 0, 1),
-            new Vector(1, 0, -1),
-            new Vector(-1, 1, 0),
-            new Vector(-1, -1, 0),
-            new Vector(-1, 0, 1),
-            new Vector(-1, 0, -1),
-            new Vector(0, 1, 1),
-            new Vector(0, 1, -1),
-            new Vector(0, -1, 1),
-            new Vector(0, -1, -1),
-    };
-
-    private Map<Player, Selector> selectors = new HashMap<>();
-
-    @EventHandler
-    public void onPlayerInteract(PlayerInteractEvent event) {
-        if (!event.hasItem()) return;
-        if (event.getItem().getType() != Material.WOODEN_AXE) return;
-        Selector selector = selectors.get(event.getPlayer());
-        if (selector != null) selector.cancel();
-        if (!event.getPlayer().isSneaking()) return;
-        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
-        Material material = event.getPlayer().getInventory().getItemInOffHand().getType();
-        if (material.isAir()) {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
-        } else {
-            selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
-        }
-        selectors.put(event.getPlayer(), selector);
-    }
-
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        Selector selector = selectors.remove(event.getPlayer());
-        if (selector != null) selector.cancel();
-    }
-
-    private class Selector {
-
-        private static final int MAX_BLOCKS = 500_000;
-
-        private int minX;
-        private int minY;
-        private int minZ;
-        private int maxX;
-        private int maxY;
-        private int maxZ;
-
-        private BukkitTask bukkitTask;
-        private Predicate<Material> predicate;
-        private Set<Location> seen = new HashSet<>();
-        private Set<Location> toCalc = new HashSet<>();
-
-        private Region.Area area;
-
-        public Selector(Block block, Player player, Predicate<Material> predicate) {
-            this.predicate = predicate;
-            toCalc.add(block.getLocation());
-            minX = block.getX();
-            minY = block.getY();
-            minZ = block.getZ();
-            maxX = block.getX();
-            maxY = block.getY();
-            maxZ = block.getZ();
-
-            Region region = Region.getRegion(block.getLocation());
-            area = Region.Area.EMPTY;
-            if (region.getBuildArea().inRegion(block.getLocation(), true)) {
-                area = region.getBuildArea();
-            } else if (region.getTestblockArea().inRegion(block.getLocation(), true)) {
-                area = region.getTestblockArea();
-            } else if (region.getArea().inRegion(block.getLocation(), true)) {
-                area = region.getArea();
-            }
-
-            bukkitTask = Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
-                run();
-
-                long volume = (long)(maxX - minX + 1) * (long)(maxY - minY + 1) * (long)(maxZ - minZ + 1);
-                player.sendTitle("", "§e" + volume + " §7Blocks", 0, 5, 0);
-
-                Point minPoint = new Point(minX, minY, minZ);
-                Point maxPoint = new Point(maxX, maxY, maxZ);
-
-                FlatteningWrapper.impl.setSelection(player, minPoint, maxPoint);
-                WorldEditRenderer.renderPlayer(player);
-
-                // boolean finished = toCalc.stream().allMatch(location -> {
-                //     return location.getBlockX() >= minX && location.getBlockY() >= minY && location.getBlockZ() >= minZ &&
-                //             location.getBlockX() <= maxX && location.getBlockY() <= maxY && location.getBlockZ() <= maxZ;
-                // });
-
-                if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
-                    bukkitTask.cancel();
-                    player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
-                }
-            }, 1, 1);
-        }
-
-        private void cancel() {
-            bukkitTask.cancel();
-        }
-
-        private void run() {
-            Set<Location> current = toCalc;
-            toCalc = new HashSet<>();
-
-            for (Location location : current) {
-                Block block = location.getBlock();
-                if (block.isEmpty() || block.isLiquid()) continue;
-                if (!predicate.test(block.getType())) continue;
-                seen.add(location);
-                if (!area.inRegion(block.getLocation(), true)) continue;
-
-                minX = Math.min(minX, location.getBlockX());
-                maxX = Math.max(maxX, location.getBlockX());
-                minY = Math.min(minY, location.getBlockY());
-                maxY = Math.max(maxY, location.getBlockY());
-                minZ = Math.min(minZ, location.getBlockZ());
-                maxZ = Math.max(maxZ, location.getBlockZ());
-
-                for (Vector face : FACES) {
-                    Block next = block.getRelative(face.getBlockX(), face.getBlockY(), face.getBlockZ());
-                    if (next.isEmpty() || next.isLiquid()) continue;
-                    if (!predicate.test(next.getType())) continue;
-                    Location loc = next.getLocation();
-                    if (seen.contains(loc)) continue;
-                    toCalc.add(loc);
-                }
-            }
-        }
-    }
-}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/above/FAWEAboveMaskParser.java

@@ -26,6 +26,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -33,6 +34,7 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEAboveMaskParser extends FAWEMaskParser {
 
     public FAWEAboveMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/below/FAWEBelowMaskParser.java

@@ -26,6 +26,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -33,6 +34,7 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEBelowMaskParser extends FAWEMaskParser {
 
     public FAWEBelowMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboard3DMaskParser.java

@@ -25,6 +25,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWECheckerboard3DMaskParser extends FAWEMaskParser {
 
     public FAWECheckerboard3DMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/checkerboard3d/FAWECheckerboardMaskParser.java

@@ -25,6 +25,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWECheckerboardMaskParser extends FAWEMaskParser {
 
     public FAWECheckerboardMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/mask/grid/FAWEGridMaskParser.java

@@ -25,6 +25,7 @@ import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.mask.Mask;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEMaskParser;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 
 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEGridMaskParser extends FAWEMaskParser {
 
     public FAWEGridMaskParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/worldedit/pattern/gradient/FAWEGradientPatternParser.java

@@ -27,6 +27,7 @@ import com.sk89q.worldedit.regions.Region;
 import de.steamwar.bausystem.features.worldedit.utils.FAWEPatternParser;
 import de.steamwar.bausystem.utils.WorldEditUtils;
 import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
 import de.steamwar.linkage.PluginCheck;
 import org.bukkit.Axis;
 
@@ -35,6 +36,7 @@ import java.util.stream.Stream;
 
 @Linked
 @PluginCheck("FastAsyncWorldEdit")
+@MinVersion(19)
 public class FAWEGradientPatternParser extends FAWEPatternParser {
 
     public FAWEGradientPatternParser() {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java

@@ -104,7 +104,7 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
             if (hidden.containsKey(region) && hidden.get(region).contains(player)) {
                 Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                     PlayerMovementWrapper.impl.setPosition(player, o);
-                }, 1L);
+                }, 0);
                 return null;
             }
             return o;

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

@@ -41,8 +41,8 @@ public class BackupScheduler implements Enable {
             @Override
             public void run() {
                 Iterator<Region> regionsToBackup = RegionSystem.INSTANCE.getRegions()
-                        .filter(region -> region.getFlags().has(Flag.CHANGED).isReadable())
-                        .filter(region -> region.getFlags().get(Flag.CHANGED).getWithDefault() == ChangedMode.HAS_CHANGE)
+                        .filter(region -> region.getRegionData().has(Flag.CHANGED).isReadable())
+                        .filter(region -> region.getRegionData().get(Flag.CHANGED).isWithDefault(ChangedMode.HAS_CHANGE))
                         .iterator();
                 if (!regionsToBackup.hasNext()) return;
                 doBackup(regionsToBackup);
@@ -63,7 +63,7 @@ public class BackupScheduler implements Enable {
                 Optional<RegionBackups.Backup> backup = region.getBackups()
                         .create(RegionBackups.BackupType.AUTOMATIC);
                 if (backup.isPresent()) {
-                    region.getFlags().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
+                    region.getRegionData().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
                 }
             }
         }.runTaskTimer(BauSystem.getInstance(), 0, 20 * 60);

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

@@ -1,43 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.region;
-
-import de.steamwar.bausystem.region.flags.Flag;
-import lombok.NonNull;
-
-import java.util.Map;
-
-public interface FlagStorage {
-
-    @NonNull
-    <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag);
-
-    /**
-     * Returns true if the flag was changed and did not already contain the provided value
-     */
-    <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value);
-
-    @NonNull
-    <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag);
-
-    void clear();
-
-    Map<Flag<?>, Flag.Value<?>> getBackedMap();
-}

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

@@ -23,7 +23,6 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.sql.GameModeConfig;
-import de.steamwar.sql.SchematicType;
 import lombok.NonNull;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -55,7 +54,7 @@ public interface Region {
     RegionType getType();
 
     @NonNull
-    FlagStorage getFlags();
+    RegionData getRegionData();
 
     @NonNull
     Area getArea();
@@ -75,9 +74,6 @@ public interface Region {
     @NonNull
     RegionBackups getBackups();
 
-    @NonNull
-    RegionData getRegionData();
-
     interface Area {
 
         Area EMPTY = new Area() {

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

@@ -49,7 +49,7 @@ public interface RegionBackups {
         private final String name;
 
         @NonNull
-        private final FlagStorage flags;
+        private final RegionData data;
 
         @CheckReturnValue
         public abstract boolean load();

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

@@ -19,75 +19,134 @@
 
 package de.steamwar.bausystem.region;
 
+import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.sql.SchematicNode;
+import lombok.NonNull;
 import yapion.hierarchy.types.YAPIONObject;
 
-import java.util.Objects;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 
-public interface RegionData {
+public abstract class RegionData {
 
-    void clear();
+    private final List<Property<?, ?>> properties = new ArrayList<>();
 
-    SchematicNode getTestblockSchematic();
+    protected final YAPIONObject data;
+    protected final YAPIONObject flagData;
+    protected final Runnable onChange;
+    protected final Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
 
-    void setTestblockSchematic(SchematicNode schematic);
+    private final class Property<T, K> {
+        private final String field;
+        private final Function<K, T> loader;
+        private final Function<T, K> writer;
 
-    RegionData EMPTY = new RegionData() {
+        private T value;
 
-        @Override
-        public void clear() {
+        public Property(String field, Function<K, T> loader, Function<T, K> writer) {
+            this.field = field;
+            this.loader = loader;
+            this.writer = writer;
+            properties.add(this);
         }
 
-        @Override
-        public SchematicNode getTestblockSchematic() {
-            return null;
-        }
-
-        @Override
-        public void setTestblockSchematic(SchematicNode schematic) {
-        }
-    };
-
-    class RegionDataImpl implements RegionData {
-
-        private final YAPIONObject yapionObject;
-        private final Runnable onChange;
-
-        public RegionDataImpl(YAPIONObject yapionObject, Runnable onChange) {
-            this.yapionObject = yapionObject;
-            this.onChange = onChange;
-
-            if (yapionObject.containsKey("testblockSchematic")) {
-                testblockSchematic = SchematicNode.getSchematicNode(yapionObject.getInt("testblockSchematic"));
-            }
-        }
-
-        @Override
-        public void clear() {
-            testblockSchematic = null;
-            yapionObject.remove("testblockSchematic");
-            onChange.run();
-        }
-
-        private SchematicNode testblockSchematic = null;
-
-        @Override
-        public SchematicNode getTestblockSchematic() {
-            return testblockSchematic;
-        }
-
-        @Override
-        public void setTestblockSchematic(SchematicNode schematic) {
-            if (Objects.equals(this.testblockSchematic, schematic)) {
-                return;
-            }
-            this.testblockSchematic = schematic;
-            if (schematic == null) {
-                yapionObject.remove("testblockSchematic");
+        public void load() {
+            if (flagData.containsKey(field)) {
+                value = loader.apply(flagData.getPlainValue(field));
             } else {
-                yapionObject.put("testblockSchematic", testblockSchematic.getId());
+                value = null;
+            }
+        }
+
+        public T get() {
+            return value;
+        }
+
+        public void set(T value) {
+            this.value = value;
+            if (value == null) {
+                flagData.remove(field);
+            } else {
+                flagData.put(field, writer.apply(value));
             }
-            onChange.run();
         }
     }
+
+    private Property<SchematicNode, Integer> testblockSchematic = new Property<>("testblockSchematic", SchematicNode::byId, SchematicNode::getId);
+
+    protected RegionData(YAPIONObject data, Runnable onChange) {
+        this.data = data;
+        this.flagData = data.getObjectOrSetDefault("flagStorage", new YAPIONObject());
+        this.onChange = onChange;
+        initialize();
+        for (final Flag flag : Flag.getFlags()) {
+            if (!has(flag).isWritable()) continue;
+            try {
+                String s = flagData.getPlainValue(flag.name());
+                flagMap.put(flag, flag.valueOfValue(s));
+            } catch (Exception e) {
+                flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
+            }
+        }
+        properties.forEach(Property::load);
+    }
+
+    protected void initialize() {
+    }
+
+    @NonNull
+    public abstract <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag);
+
+    /**
+     * Returns true if the flag was changed and did not already contain the provided value
+     */
+    public final <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
+        if (has(flag).isWritable()) {
+            if (flagMap.put(flag, value) != value) {
+                flagData.put(flag.name(), value.name());
+                onChange.run();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @NonNull
+    public final <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
+        return FlagOptional.of(flag, (T) flagMap.get(flag));
+    }
+
+    public final void clear() {
+        for (Flag flag : Flag.getFlags()) {
+            if (has(flag).isWritable()) {
+                flagMap.remove(flag);
+                flagData.remove(flag.name());
+            }
+        }
+        properties.forEach(property -> property.set(null));
+        onChange.run();
+    }
+
+    public final Map<Flag<?>, Flag.Value<?>> getBackedMap() {
+        return flagMap;
+    }
+
+    public SchematicNode getTestblockSchematic() {
+        return testblockSchematic.get();
+    }
+
+    public void setTestblockSchematic(SchematicNode schematic) {
+        testblockSchematic.set(schematic);
+        onChange.run();
+    }
+
+    @Override
+    public final String toString() {
+        return getClass().getSimpleName() + "{" +
+                "flagMap=" + flagMap +
+                '}';
+    }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java

@@ -43,6 +43,7 @@ public final class Flag<T extends Enum<T> & Flag.Value<T>> implements EnumDispla
     public static final Flag<NoGravityMode> NO_GRAVITY = new Flag<>("NO_GRAVITY", "FLAG_NO_GRAVITY", NoGravityMode.class, NoGravityMode.INACTIVE);
     public static final Flag<TestblockMode> TESTBLOCK = new Flag<>("TESTBLOCK", "FLAG_TESTBLOCK", TestblockMode.class, TestblockMode.NO_VALUE);
     public static final Flag<ChangedMode> CHANGED = new Flag<>("CHANGED", "FLAG_CHANGED", ChangedMode.class, ChangedMode.NO_CHANGE);
+    public static final Flag<WaterDestroyMode> WATER_DESTROY = new Flag<>("WATER_DESTROY", "FLAG_WATER_DESTROY", WaterDestroyMode.class, WaterDestroyMode.ALLOW);
 
     private String name;
     private int ordinal;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/WaterDestroyMode.java

@@ -0,0 +1,56 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.region.flags;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum WaterDestroyMode implements Flag.Value<WaterDestroyMode> {
+
+    ALLOW("FLAG_WATER_DESTROY_ALLOW"),
+    DENY("FLAG_WATER_DESTROY_DENY");
+
+    private static WaterDestroyMode[] values;
+    private final String chatValue;
+
+    @Override
+    public WaterDestroyMode[] getValues() {
+        if (WaterDestroyMode.values == null) {
+            WaterDestroyMode.values = WaterDestroyMode.values();
+        }
+        return WaterDestroyMode.values;
+    }
+
+    @Override
+    public WaterDestroyMode getValue() {
+        return this;
+    }
+
+    @Override
+    public WaterDestroyMode getValueOf(final String name) {
+        try {
+            return WaterDestroyMode.valueOf(name.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            return ALLOW;
+        }
+    }
+}

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java

@@ -1,106 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.region.fixed;
-
-import de.steamwar.bausystem.region.FlagOptional;
-import de.steamwar.bausystem.region.FlagStorage;
-import de.steamwar.bausystem.region.RegionFlagPolicy;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.worlddata.WorldData;
-import de.steamwar.core.Core;
-import lombok.NonNull;
-import yapion.hierarchy.types.YAPIONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class FixedFlagStorage implements FlagStorage {
-
-    private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
-    private YAPIONObject data;
-
-    public FixedFlagStorage(YAPIONObject data) {
-        this.data = data;
-        for (final Flag flag : Flag.getFlags()) {
-            if (!has(flag).isWritable()) continue;
-            try {
-                String s = data.getPlainValue(flag.name());
-                flagMap.put(flag, flag.valueOfValue(s));
-            } catch (Exception e) {
-                flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
-            }
-        }
-    }
-
-    @Override
-    public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.COLOR, Flag.TNT, Flag.FIRE, Flag.FREEZE, Flag.PROTECT, Flag.NO_GRAVITY, Flag.CHANGED)) {
-            return RegionFlagPolicy.WRITABLE;
-        }
-        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
-            return RegionFlagPolicy.WRITABLE;
-        }
-        if (flag.oneOf(Flag.TESTBLOCK)) {
-            return RegionFlagPolicy.READ_ONLY;
-        }
-        return RegionFlagPolicy.NOT_APPLICABLE;
-    }
-
-    @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
-        if (has(flag).isWritable()) {
-            boolean hasChanged = flagMap.put(flag, value) != value;
-            if (hasChanged) {
-                data.put(flag.name(), value.name());
-                WorldData.write();
-            }
-            return hasChanged;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
-        return FlagOptional.of(flag, (T) flagMap.get(flag));
-    }
-
-    @Override
-    public void clear() {
-        for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.TESTBLOCK) continue;
-            if (flag == Flag.COLOR) continue;
-            if (flag == Flag.CHANGED) continue;
-            flagMap.remove(flag);
-        }
-    }
-
-    @Override
-    public Map<Flag<?>, Flag.Value<?>> getBackedMap() {
-        return flagMap;
-    }
-
-    @Override
-    public String toString() {
-        return "FixedFlagStorage{" +
-                "flagMap=" + flagMap +
-                '}';
-    }
-}

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedGlobalFlagStorage.java

@@ -1,113 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2025 SteamWar.de-Serverteam
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
- *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.bausystem.region.fixed;
-
-import de.steamwar.bausystem.region.FlagOptional;
-import de.steamwar.bausystem.region.FlagStorage;
-import de.steamwar.bausystem.region.RegionFlagPolicy;
-import de.steamwar.bausystem.region.flags.ColorMode;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.bausystem.region.flags.ProtectMode;
-import de.steamwar.bausystem.region.flags.TNTMode;
-import de.steamwar.bausystem.worlddata.WorldData;
-import de.steamwar.core.Core;
-import lombok.NonNull;
-import yapion.hierarchy.types.YAPIONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class FixedGlobalFlagStorage implements FlagStorage {
-
-    private Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
-    private YAPIONObject data;
-
-    public FixedGlobalFlagStorage(YAPIONObject data) {
-        flagMap.put(Flag.TNT, TNTMode.DENY);
-        this.data = data;
-        for (final Flag flag : Flag.getFlags()) {
-            if (!has(flag).isWritable()) continue;
-            try {
-                String s = data.getPlainValue(flag.name());
-                flagMap.put(flag, flag.valueOfValue(s));
-            } catch (Exception e) {
-                flagMap.put(flag, (Flag.Value<?>) flag.getDefaultValue());
-            }
-        }
-    }
-
-    @Override
-    public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.COLOR)) {
-            return RegionFlagPolicy.READ_ONLY;
-        }
-        if (flag.oneOf(Flag.ITEMS) && Core.getVersion() >= 20) {
-            return RegionFlagPolicy.WRITABLE;
-        }
-        if (flag.oneOf(Flag.TNT, Flag.FIRE, Flag.FREEZE)) {
-            return RegionFlagPolicy.WRITABLE;
-        }
-        return RegionFlagPolicy.NOT_APPLICABLE;
-    }
-
-    @Override
-    public <T extends Enum<T> & Flag.Value<T>> boolean set(@NonNull Flag<T> flag, @NonNull T value) {
-        if (has(flag).isWritable()) {
-            data.put(flag.name(), value.name());
-            WorldData.write();
-            return flagMap.put(flag, value) != value;
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public @NonNull <T extends Enum<T> & Flag.Value<T>> FlagOptional<T> get(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.COLOR)) {
-            return FlagOptional.of((Flag) flag, ColorMode.YELLOW);
-        }
-        if (flag.oneOf(Flag.PROTECT)) {
-            return FlagOptional.of((Flag) flag, ProtectMode.INACTIVE);
-        }
-        return FlagOptional.of(flag, (T) flagMap.get(flag));
-    }
-
-    @Override
-    public void clear() {
-        for (Flag flag : Flag.getFlags()) {
-            if (flag == Flag.TESTBLOCK) continue;
-            if (flag == Flag.COLOR) continue;
-            if (flag == Flag.CHANGED) continue;
-            flagMap.remove(flag);
-        }
-    }
-
-    @Override
-    public Map<Flag<?>, Flag.Value<?>> getBackedMap() {
-        return flagMap;
-    }
-
-    @Override
-    public String toString() {
-        return "FixedGlobalFlagStorage{" +
-                "flagMap=" + flagMap +
-                '}';
-    }
-}