With EndsWithHandler

Improve HandlerForVariableElement.getAnnotations()
Improve HandlerForTypeMirror.isEnum
Add HandlerForTypeMirror.getTypeName

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

@@ -1,46 +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.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_Main/src/BauSystem.properties

@@ -1030,7 +1030,6 @@ 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_START_HELP=§8/§etls start §8: §7Start the TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8- §7Stop 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

@@ -961,7 +961,6 @@ 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_START_HELP=§8/§etls start §8: §7Starte den TNT Listener
-TLS_STOP_HELP=§8/§etls stop §8- §7Stope 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/Permission.java

@@ -27,6 +27,8 @@ 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
@@ -37,12 +39,13 @@ 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}
      */
-    SPECTATOR(bauweltMember -> {
+    REAL_SPECTATOR(bauweltMember -> {
         return !bauweltMember.isBuild() && !bauweltMember.isSupervisor();
     }),
     /**
@@ -52,6 +55,28 @@ 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) {
@@ -61,10 +86,10 @@ public enum Permission {
 
     public boolean hasPermission(Player member) {
         if (SteamwarUser.get(member.getUniqueId()).getId() == BauServer.getInstance().getOwnerID()) {
-            return this != SPECTATOR;
+            return this != REAL_SPECTATOR;
         }
         BauweltMember bauweltMember = BauweltMember.getBauMember(BauServer.getInstance().getOwner(), member.getUniqueId());
-        if (bauweltMember == null) return this == SPECTATOR;
+        if (bauweltMember == null) return this == REAL_SPECTATOR;
         return permissionPredicate.test(bauweltMember);
     }
 }

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

@@ -32,7 +32,6 @@ 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;
@@ -121,7 +120,6 @@ 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.getRegionData().get(Flag.CHANGED).isWithDefault(ChangedMode.NO_CHANGE)) {
+        if (region.getFlags().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.getRegionData().has(flag).isApplicable()) continue;
+            if (!region.getFlags().has(flag).isApplicable()) continue;
-            FlagOptional<?> value = region.getRegionData().get(flag);
+            FlagOptional<?> value = region.getFlags().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

@@ -0,0 +1,71 @@
+/*
+ *   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.getRegionData().has(flag).isApplicable()) continue;
+            if (!region.getFlags().has(flag).isApplicable()) continue;
-            FlagOptional<?> value = region.getRegionData().get(flag);
+            FlagOptional<?> value = region.getFlags().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,10 +21,9 @@ 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;
@@ -32,32 +31,13 @@ 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");
@@ -67,20 +47,61 @@ public class Countingwand {
 		return itemStack;
 	}
 
-    public boolean isCountingwand(ItemStack itemStack) {
+	private final Map<String, Pair<Point, Point>> selections = new HashMap<>();
-        return ItemUtils.isItem(itemStack, "countingwand");
-    }
 
-    public void checkSelection(final Point point, final boolean pos1, final Player p) {
+	public boolean isCountingwand(ItemStack itemStack) {
-        SWPlayer player = SWPlayer.of(p);
+		return ItemUtils.isItem(itemStack, "countingwand");
-        CountingWandComponent countingWandComponent = player.getComponentOrDefault(CountingWandComponent.class, CountingWandComponent::new);
+	}
-        if (countingWandComponent.setPosition(pos1, point)) {
+
-            Point point1 = countingWandComponent.pos1;
+	public void checkSelection(final Point point, final boolean pos1, final Player p) {
-            Point point2 = countingWandComponent.pos2;
+		Pair<Point, Point> selection = selections.get(p.getUniqueId().toString());
-            int amount = (Math.abs(point1.getX() - point2.getX()) + 1) * (Math.abs(point1.getY() - point2.getY()) + 1) * (Math.abs(point1.getZ() - point2.getZ()) + 1);
+		final boolean newPos;
-            String dimension = player.using(BauSystem.MESSAGE).parse("COUNTINGWAND_MESSAGE_VOLUME", amount);
+		if (selection != null) {
-            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);
+			if (pos1) {
-            player.sendMessage(pos1 ? "COUNTINGWAND_MESSAGE_RCLICK" : "COUNTINGWAND_MESSAGE_LCLICK", point.getX(), point.getY(), point.getZ(), dimension, volume);
+				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);
+	}
 }

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

@@ -27,6 +27,7 @@ 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;
@@ -66,4 +67,9 @@ 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/detonator/Detonator.java

@@ -25,11 +25,8 @@ 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;
@@ -48,28 +45,7 @@ import java.util.*;
 @UtilityClass
 public class Detonator {
 
-    public class DetonatorComponent implements SWPlayer.Component {
+    private static final Map<Player, REntityServer> ENTITIES_MAP = new HashMap<>();
-        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) {
@@ -77,19 +53,28 @@ public class Detonator {
     }
 
     public static void showDetonator(Player p, List<Location> locs) {
-        DetonatorComponent detonatorComponent = SWPlayer.of(p).getComponentOrDefault(DetonatorComponent.class, DetonatorComponent::new);
+        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);
+
         locs.forEach(location -> {
-            RFallingBlockEntity entity = new RFallingBlockEntity(detonatorComponent.entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
+            RFallingBlockEntity entity = new RFallingBlockEntity(entities, location.clone().add(HALF), Material.RED_STAINED_GLASS);
             entity.setNoGravity(true);
         });
     }
 
     public static void hideDetonator(Player p) {
-        SWPlayer.of(p).removeComponent(DetonatorComponent.class);
+        ENTITIES_MAP.remove(p).close();
     }
 
     public static boolean hasActiveDetonatorShow(Player p) {
-        return SWPlayer.of(p).hasComponent(DetonatorComponent.class);
+        return ENTITIES_MAP.containsKey(p);
     }
 
     public static void activateDetonator(DetonatorStorage detonator) {

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

@@ -24,7 +24,6 @@ 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;
@@ -37,11 +36,15 @@ 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));
@@ -63,59 +66,64 @@ 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(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getItem())) 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);
-            SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
+            HAS_UPDATED.add(event.getPlayer());
         }
     }
 
     @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());
             }
-            return;
+        } else {
+            if (!Detonator.hasActiveDetonatorShow(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());
+        if (HAS_UPDATED.contains(event.getPlayer())) {
-            return;
+            HAS_UPDATED.remove(event.getPlayer());
+            if (Detonator.hasActiveDetonatorShow(event.getPlayer())) {
+                Detonator.hideDetonator(event.getPlayer());
+                Detonator.showDetonator(event.getPlayer(), new ItemStorage(event.getPlayer()).getLocations());
+            }
         }
-        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(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) return;
+        if (Detonator.isDetonator(event.getPlayer().getInventory().getItemInMainHand())) {
-        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
+            HAS_UPDATED.add(event.getPlayer());
+        }
     }
 
     @EventHandler
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!(Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem()))) return;
+        if (Detonator.isDetonator(event.getMainHandItem()) || Detonator.isDetonator(event.getOffHandItem())) {
-        SWPlayer.of(event.getPlayer()).getComponent(Detonator.DetonatorComponent.class).ifPresent(detonatorComponent -> detonatorComponent.setHasUpdated(true));
+            HAS_UPDATED.add(event.getPlayer());
+        }
     }
 }

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

@@ -26,7 +26,6 @@ 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;
@@ -41,17 +40,21 @@ 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, SWPlayer.Component {
+public class Loader implements Listener {
+
+    private static final Map<Player, Loader> LOADER_MAP = new HashMap<>();
 
     public static Loader getLoader(Player player) {
-        return SWPlayer.of(player).getComponent(Loader.class).orElse(null);
+        return LOADER_MAP.get(player);
     }
 
     public static void newLoader(Player player) {
-        SWPlayer.of(player).setComponent(new Loader(player));
+        LOADER_MAP.put(player, new Loader(player));
     }
 
     private final Player p;
@@ -142,7 +145,7 @@ public class Loader implements Listener, SWPlayer.Component {
             recorder = null;
         }
         elements.clear();
-        SWPlayer.of(p).removeComponent(Loader.class);
+        LOADER_MAP.remove(p);
     }
 
     public boolean setTicksBetweenShots(int delay) {

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

@@ -29,7 +29,6 @@ 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;
@@ -157,7 +156,6 @@ 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,7 +21,6 @@ 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;
@@ -35,7 +34,7 @@ import org.bukkit.entity.Player;
 
 import java.util.*;
 
-public class ObserverTracer implements SWPlayer.Component {
+public class ObserverTracer {
 
     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,7 +21,6 @@ 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;
 
@@ -42,23 +41,23 @@ public class ObserverTracerCommand extends SWCommand {
     @Register(value = "disable", description = "OBSERVER_HELP_DISABLE")
     public void disable(Player p) {
         ObserverTracerListener.enabled.remove(p);
-        SWPlayer.of(p).removeComponent(ObserverTracer.class);
+        ObserverTracerListener.observerTracerMap.remove(p);
         BauSystem.MESSAGE.send("OBSERVER_DISABLE", p);
     }
 
     @Register(value = "delete", description = "OBSERVER_HELP_DELETE")
     public void delete(@Validator Player p) {
-        SWPlayer.of(p).removeComponent(ObserverTracer.class);
+        ObserverTracerListener.observerTracerMap.remove(p);
         BauSystem.MESSAGE.send("OBSERVER_DELETE", p);
     }
 
     @Register(value = "retrace", description = "OBSERVER_HELP_RETRACE")
     public void retrace(@Validator Player p) {
-        if (SWPlayer.of(p).hasComponent(ObserverTracer.class)) {
+        if (ObserverTracerListener.observerTracerMap.containsKey(p)) {
             BauSystem.MESSAGE.send("OBSERVER_RETRACE_NO_TRACE", p);
             return;
         }
-        SWPlayer.of(p).getComponent(ObserverTracer.class).ifPresent(ObserverTracer::trace);
+        ObserverTracerListener.observerTracerMap.get(p).trace();
         BauSystem.MESSAGE.send("OBSERVER_RETRACE_DONE", p);
     }
 }

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

@@ -22,7 +22,6 @@ 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;
@@ -35,19 +34,23 @@ 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(), () -> {
-            SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
+            observerTracerMap.forEach((player, observerTracer) -> {
-                if (pair.getKey().getGameMode() != GameMode.SPECTATOR) return;
+                if (player.getGameMode() == GameMode.SPECTATOR) {
-                pair.getValue().show();
+                    observerTracer.show();
+                }
             });
         }, 15L, 15L);
     }
@@ -55,16 +58,20 @@ 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 (!enabled.contains(event.getPlayer())) {
-        if (event.getClickedBlock() == null) return;
+            return;
-        ObserverTracer observerTracer = SWPlayer.of(event.getPlayer()).getComponent(ObserverTracer.class).orElse(null);
+        }
-        if (observerTracer != null) {
+        if (event.getClickedBlock() == null) {
+            return;
+        }
+        if (observerTracerMap.containsKey(event.getPlayer())) {
+            ObserverTracer observerTracer = observerTracerMap.get(event.getPlayer());
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (!observerTracer.trace()) {
                     createNew(event);
                 }
-                SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
+                observerTracerMap.forEach((player, o) -> {
-                    pair.getValue().trace();
+                    o.trace();
                 });
             }, 1L);
         } else {
@@ -79,13 +86,13 @@ public class ObserverTracerListener implements Listener {
         if (event.getClickedBlock().getType() == Material.OBSERVER) {
             ObserverTracer observerTracer = new ObserverTracer(event.getPlayer(), event.getClickedBlock());
             observerTracer.trace();
-            SWPlayer.of(event.getPlayer()).setComponent(observerTracer);
+            observerTracerMap.put(event.getPlayer(), observerTracer);
         }
     }
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewBuilder().forEach(player -> SWPlayer.of(player).removeComponent(ObserverTracer.class));
+        event.getNewSpectator().forEach(observerTracerMap::remove);
     }
 
     @EventHandler
@@ -96,5 +103,6 @@ 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.getRegionData().set(Flag.COLOR, color);
+                region.getFlags().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.getRegionData().has(Flag.COLOR).isWritable()) {
+        if (!region.getFlags().has(Flag.COLOR).isWritable()) {
             BauSystem.MESSAGE.send("REGION_COLOR_NO_REGION", p);
             return;
         }
-        region.getRegionData().set(Flag.COLOR, color);
+        region.getFlags().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.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+        if (region.getFlags().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
-            region.getRegionData().set(Flag.FIRE, FireMode.DENY);
+            region.getFlags().set(Flag.FIRE, FireMode.DENY);
             return true;
         } else {
-            region.getRegionData().set(Flag.FIRE, FireMode.ALLOW);
+            region.getFlags().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()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
     }
 
     @EventHandler
     public void onFireSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) e.setCancelled(true);
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().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.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.DENY)) return null;
+        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.getRegionData().get(Flag.FIRE).getWithDefault().getChatValue(), p);
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FIRE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().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.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (region.getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
-            region.getRegionData().set(Flag.FREEZE, FreezeMode.INACTIVE);
+            region.getFlags().set(Flag.FREEZE, FreezeMode.INACTIVE);
             return false;
         } else {
-            region.getRegionData().set(Flag.FREEZE, FreezeMode.ACTIVE);
+            region.getFlags().set(Flag.FREEZE, FreezeMode.ACTIVE);
             return true;
         }
     }

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

@@ -48,7 +48,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent e) {
-        if (Region.getRegion(e.getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         e.setCancelled(true);
         if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
@@ -60,7 +60,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
     @EventHandler
     public void onBlockCanBuild(BlockCanBuildEvent e) {
         if (!e.isBuildable()) return;
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return;
         if (e.getMaterial() == Material.TNT) {
             e.setBuildable(false);
             e.getBlock().setType(Material.TNT, false);
@@ -69,14 +69,14 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().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 +101,44 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onPistonExtend(BlockPistonExtendEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onPistonRetract(BlockPistonRetractEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockGrow(BlockGrowEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onRedstoneEvent(BlockRedstoneEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setNewCurrent(e.getOldCurrent());
         }
     }
 
     @EventHandler
     public void onBlockDispense(BlockDispenseEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().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()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (e.getDestination().getLocation() != null && Region.getRegion(e.getDestination().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
-        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        } else if (e.getSource().getLocation() != null && Region.getRegion(e.getSource().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -147,7 +147,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()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
             e.getBlock().setType(Material.BARRIER, false);
             e.getBlock().setType(Material.AIR, false);
@@ -170,35 +170,35 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onFluidLevelChange(FluidLevelChangeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockSpread(BlockSpreadEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockFromTo(BlockFromToEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onSpongeAbsorb(SpongeAbsorbEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
 
     @EventHandler
     public void onBlockForm(BlockFormEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -206,7 +206,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()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getClickedBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             Block block = e.getClickedBlock();
             if (block.getType() == Material.LEVER) {
                 Switch data = ((Switch) block.getBlockData());
@@ -218,7 +218,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @EventHandler
     public void onBlockFade(BlockFadeEvent e) {
-        if (Region.getRegion(e.getBlock().getLocation()).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (Region.getRegion(e.getBlock().getLocation()).getFlags().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
             e.setCancelled(true);
         }
     }
@@ -235,7 +235,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
 
     @Override
     public String get(Region region, Player p) {
-        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.INACTIVE)) return null;
+        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.getRegionData().get(Flag.FREEZE).getWithDefault().getChatValue(), p);
+        return "§e" + BauSystem.MESSAGE.parse(Flag.FREEZE.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().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.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
+        if (region.getFlags().get(Flag.ITEMS).isWithDefault(ItemMode.ACTIVE)) {
-            region.getRegionData().set(Flag.ITEMS, ItemMode.INACTIVE);
+            region.getFlags().set(Flag.ITEMS, ItemMode.INACTIVE);
             return false;
         } else {
-            region.getRegionData().set(Flag.ITEMS, ItemMode.ACTIVE);
+            region.getFlags().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()).getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getFlags().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.getRegionData().get(Flag.ITEMS).isWithDefault(ItemMode.INACTIVE)) return null;
+        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.getRegionData().get(Flag.ITEMS).getWithDefault().getChatValue(), p);
+        return "§e" + BauSystem.MESSAGE.parse(Flag.ITEMS.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().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.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+        if (region.getFlags().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
-            region.getRegionData().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
+            region.getFlags().set(Flag.NO_GRAVITY, NoGravityMode.INACTIVE);
             return false;
         } else {
-            region.getRegionData().set(Flag.NO_GRAVITY, NoGravityMode.ACTIVE);
+            region.getFlags().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()).getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.ACTIVE)) {
+        if (Region.getRegion(event.getLocation()).getFlags().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.getRegionData().get(Flag.NO_GRAVITY).isWithDefault(NoGravityMode.INACTIVE)) return null;
+        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.getRegionData().get(Flag.NO_GRAVITY).getWithDefault().getChatValue(), p);
+        return "§e" + BauSystem.MESSAGE.parse(Flag.NO_GRAVITY.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().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.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+        if (region.getFlags().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
-            region.getRegionData().set(Flag.PROTECT, ProtectMode.INACTIVE);
+            region.getFlags().set(Flag.PROTECT, ProtectMode.INACTIVE);
             RegionUtils.actionBar(region, "REGION_PROTECT_DISABLE");
         } else {
-            region.getRegionData().set(Flag.PROTECT, ProtectMode.ACTIVE);
+            region.getFlags().set(Flag.PROTECT, ProtectMode.ACTIVE);
             RegionUtils.actionBar(region, "REGION_PROTECT_ENABLE");
         }
     }
 
     private Region regionCheck(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        if (!region.getRegionData().has(Flag.PROTECT).isApplicable()) {
+        if (!region.getFlags().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.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return;
+        if (region.getFlags().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.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.INACTIVE)) return null;
+        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.getRegionData().get(Flag.PROTECT).getWithDefault().getChatValue(), p);
+        return "§e" + BauSystem.MESSAGE.parse(Flag.PROTECT.getChatValue(), p) + "§8: " + BauSystem.MESSAGE.parse(region.getFlags().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.getRegionData().get(Flag.COLOR).getWithDefault());
+                    .color(region.getFlags().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.getRegionData().get(Flag.COLOR).getWithDefault());
+                    .color(region.getFlags().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).getRegionData().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
+        Region.getRegion(location).getFlags().set(Flag.CHANGED, ChangedMode.HAS_CHANGE);
     }
 }

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

@@ -53,8 +53,9 @@ public class ResetCommand extends SWCommand {
         if (region == null) return;
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getArea().getResetFile()))
-                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
+                    .color(region.getFlags().get(Flag.COLOR).getWithDefault());
             region.getArea().reset(pasteBuilder, false);
+            region.getFlags().clear();
             region.getRegionData().clear();
             RegionUtils.message(region, "REGION_RESET_RESETED");
         } catch (SecurityException e) {
@@ -83,7 +84,7 @@ public class ResetCommand extends SWCommand {
         }
         try {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.SchematicProvider(node))
-                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
+                    .color(region.getFlags().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.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getFlags().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.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getFlags().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.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+        if (requestedMode != null && region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
-            region.getRegionData().set(Flag.TNT, requestedMode);
+            region.getFlags().set(Flag.TNT, requestedMode);
             RegionUtils.actionBar(region, requestedMessage);
             return;
         }
-        switch (region.getRegionData().get(Flag.TNT).getWithDefault()) {
+        switch (region.getFlags().get(Flag.TNT).getWithDefault()) {
             case ALLOW:
             case ONLY_TB:
-                region.getRegionData().set(Flag.TNT, TNTMode.DENY);
+                region.getFlags().set(Flag.TNT, TNTMode.DENY);
                 RegionUtils.actionBar(region, getDisableMessage());
                 break;
             case DENY:
-                if (region.getRegionData().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
+                if (region.getFlags().get(Flag.TESTBLOCK).isNotWithDefault(TestblockMode.NO_VALUE)) {
-                    region.getRegionData().set(Flag.TNT, TNTMode.ONLY_TB);
+                    region.getFlags().set(Flag.TNT, TNTMode.ONLY_TB);
                     RegionUtils.actionBar(region, getTestblockEnableMessage());
                 } else {
-                    region.getRegionData().set(Flag.TNT, TNTMode.ALLOW);
+                    region.getFlags().set(Flag.TNT, TNTMode.ALLOW);
                     RegionUtils.actionBar(region, getEnableMessage());
                 }
                 break;

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

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

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

@@ -72,14 +72,6 @@ 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;
@@ -100,10 +92,29 @@ public class TestblockCommand extends SWCommand {
             }
         }
 
-        if (node == null) {
+        // Beta Tester enabled
-            node = region.getRegionData().getTestblockSchematic();
+        switch (BauServer.getInstance().getOwnerID()) {
-        } else {
+            case 245:
-            region.getRegionData().setTestblockSchematic(node);
+            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;
         }
 
         PasteBuilder.ClipboardProvider clipboardProvider;
@@ -119,7 +130,7 @@ public class TestblockCommand extends SWCommand {
                     .onlyColors(onlyColors)
                     .removeTNT(removeTNT)
                     .removeWater(removeWater)
-                    .color(region.getRegionData().get(Flag.COLOR).getWithDefault());
+                    .color(region.getFlags().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/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.getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode mode = region.getFlags().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()).getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK);
+        ColorMode current = Region.getRegion(p.getLocation()).getFlags().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.getRegionData().has(Flag.FIRE).isApplicable()) {
+        if (!region.getFlags().has(Flag.FIRE).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.getRegionData().get(Flag.FIRE).isWithDefault(FireMode.ALLOW)) {
+        if (region.getFlags().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.getRegionData().has(Flag.FREEZE).isApplicable()) {
+        if (!region.getFlags().has(Flag.FREEZE).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) {
+        if (region.getFlags().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.getRegionData().has(Flag.PROTECT).isApplicable()) {
+        if (!region.getFlags().has(Flag.PROTECT).isApplicable()) {
             return new SWItem(Material.BARRIER, "").getItemStack();
         }
-        if (region.getRegionData().get(Flag.PROTECT).isWithDefault(ProtectMode.ACTIVE)) {
+        if (region.getFlags().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()).getRegionData().get(Flag.TNT).getWithDefault()) {
+        switch (Region.getRegion(player.getLocation()).getFlags().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()).getRegionData().get(Flag.TNT).getWithDefault()) {
+            switch (Region.getRegion(p.getLocation()).getFlags().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) {
-        playerSet.remove(event.getPlayer());
+        ScriptRunner.remove(event.getPlayer());
     }
 
     @EventHandler

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

@@ -23,11 +23,8 @@ 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;
@@ -47,25 +44,12 @@ public class ScriptRunner {
     // Key   -> bau-script-<BUCH NAME>
     // Value -> <LUA Script>
 
-    public class ScriptData implements SWPlayer.Component {
+    private static final Map<Player, Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>>> EVENT_MAP = new HashMap<>();
-        private Map<SteamWarGlobalLuaPlugin.EventType, List<LuaFunction>> events = new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class);
+    private static final Map<Player, Map<Hotkey, List<LuaFunction>>> HOTKEY_MAP = new HashMap<>();
-        private Map<Hotkey, List<LuaFunction>> hotkeys = new HashMap<>();
+    private static final Map<Player, Map<String, CommandRegister>> COMMAND_MAP = 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 SWPlayer.of(player).getComponentOrDefault(ScriptData.class, ScriptData::new).commands.keySet();
+        return COMMAND_MAP.getOrDefault(player, new HashMap<>()).keySet();
     }
 
     public static void runScript(String script, Player player) {
@@ -80,12 +64,10 @@ 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) -> scriptData.events.computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
+                (s, luaFunction) -> EVENT_MAP.computeIfAbsent(player, player1 -> new EnumMap<>(SteamWarGlobalLuaPlugin.EventType.class)).computeIfAbsent(s, s1 -> new ArrayList<>()).add(luaFunction),
-                (s, luaFunction) -> scriptData.hotkeys.computeIfAbsent(Hotkey.fromString(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 -> scriptData.commands.put(commandRegister.getName(), commandRegister));
+                commandRegister -> COMMAND_MAP.computeIfAbsent(player, player1 -> new HashMap<>()).put(commandRegister.getName(), commandRegister));
 
         for (String script : scripts) {
             catchScript("SCRIPT_ERROR_GLOBAL", player, () -> globals.load(script).call());
@@ -93,14 +75,13 @@ public class ScriptRunner {
     }
 
     public static void remove(Player player) {
-        SWPlayer.of(player).removeComponent(ScriptData.class);
+        EVENT_MAP.remove(player);
+        COMMAND_MAP.remove(player);
+        HOTKEY_MAP.remove(player);
     }
 
     public static void callEvent(Player player, SteamWarGlobalLuaPlugin.EventType event, LuaValue eventValue, Event wrappedEvent) {
-        List<LuaFunction> luaFunctions = SWPlayer.of(player).getComponent(ScriptData.class)
+        List<LuaFunction> luaFunctions = EVENT_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(event, Collections.emptyList());
-                .map(scriptData -> scriptData.events)
-                .orElse(Collections.emptyMap())
-                .getOrDefault(event, Collections.emptyList());
         if (luaFunctions.isEmpty()) {
             if(event == SteamWarGlobalLuaPlugin.EventType.DoubleSwap) {
                 player.performCommand("gui");
@@ -143,10 +124,7 @@ public class ScriptRunner {
     }
 
     public static boolean callCommand(Player player, String command, String[] argsArray) {
-        CommandRegister commandRegister = SWPlayer.of(player).getComponent(ScriptData.class)
+        CommandRegister commandRegister = COMMAND_MAP.getOrDefault(player, Collections.emptyMap()).get(command);
-                .map(scriptData -> scriptData.commands)
-                .orElse(Collections.emptyMap())
-                .get(command);
         if (commandRegister == null) {
             return false;
         }
@@ -210,11 +188,7 @@ public class ScriptRunner {
 
     public static void callHotkey(int mods, int key, Player player, boolean pressed) {
         Hotkey hotkey = Hotkey.fromChar(key, mods);
-        List<LuaFunction> hotkeys = SWPlayer.of(player).getComponent(ScriptData.class)
+        catchScript("SCRIPT_ERROR_GLOBAL", player, () -> HOTKEY_MAP.getOrDefault(player, Collections.emptyMap()).getOrDefault(hotkey, Collections.emptyList()).forEach(luaFunction -> luaFunction.call(LuaValue.valueOf(pressed))));
-                .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,24 +21,44 @@ 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(" ");
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).contains(split[0])) {
-        if (scriptData.getCalledCommands().contains(split[0])) return;
+            return;
+        }
 
-        scriptData.getCalledCommands().add(split[0]);
+        calledCommands.getOrDefault(event.getPlayer(), new HashSet<>()).add(split[0]);
         event.setCancelled(ScriptRunner.callCommand(event.getPlayer(), split[0].substring(1), split));
-        scriptData.getCalledCommands().remove(split[0]);
+        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());
     }
 }

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

@@ -25,7 +25,6 @@ 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;
@@ -44,27 +43,32 @@ 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();
-            SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
+            LAST_FS.entrySet().removeIf(entry -> millis - entry.getValue() > 200);
-                    .filter(pair -> millis - pair.getValue().getLastF() > 200)
-                    .forEach(pair -> pair.getValue().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());
@@ -72,20 +76,19 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (LAST_FS.containsKey(event.getPlayer())) {
-        if (scriptData.getLastF() != Long.MAX_VALUE) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DoubleSwap, LuaValue.NIL, event);
             }, 1);
         } else {
-            scriptData.setLastF(System.currentTimeMillis());
+            LAST_FS.put(event.getPlayer(), 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());
@@ -96,7 +99,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());
@@ -105,12 +108,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(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        if (ignore.remove(event.getPlayer())) {
-        if (scriptData.isIgnore()) {
-            scriptData.setIgnore(false);
             return;
         }
         LuaTable table = new LuaTable();
@@ -121,7 +124,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());
@@ -147,7 +150,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);
             }
@@ -169,7 +172,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) {
@@ -181,9 +184,8 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
-        if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
+        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        ScriptRunner.ScriptData scriptData = SWPlayer.of(event.getPlayer()).getComponentOrDefault(ScriptRunner.ScriptData.class, ScriptRunner.ScriptData::new);
+        ignore.add(event.getPlayer());
-        scriptData.setIgnore(true);
         LuaTable table = new LuaTable();
         table.set("type", event.getItemDrop().getItemStack().getType().name());
         ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.DropItem, table, event);
@@ -192,7 +194,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,7 +48,6 @@ 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<>();
 
@@ -117,7 +116,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 (!ignoreCommandFromWorldEdit.contains(commandSplit[0]) && hasFAWE && WorldEditListener.isWorldEditCommand("/" + commandSplit[0])) {
+                if (!commandSplit[0].equals("select") && 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().getRegionData().get(Flag.TNT).nameWithDefault()));
+        tntLib.set("mode", getter(() -> region.get().getFlags().get(Flag.TNT).nameWithDefault()));
-        tntLib.set("enabled", getter(() -> region.get().getRegionData().get(Flag.TNT).orElse(null) != TNTMode.DENY));
+        tntLib.set("enabled", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) != TNTMode.DENY));
-        tntLib.set("onlyTb", getter(() -> region.get().getRegionData().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
+        tntLib.set("onlyTb", getter(() -> region.get().getFlags().get(Flag.TNT).orElse(null) == TNTMode.ONLY_TB));
         table.set("tnt", tntLib);
 
-        table.set("fire", getter(() -> region.get().getRegionData().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
+        table.set("fire", getter(() -> region.get().getFlags().get(Flag.FIRE).orElse(null) == FireMode.ALLOW));
-        table.set("freeze", getter(() -> region.get().getRegionData().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
+        table.set("freeze", getter(() -> region.get().getFlags().get(Flag.FREEZE).orElse(null) == FreezeMode.ACTIVE));
-        table.set("protect", getter(() -> region.get().getRegionData().get(Flag.PROTECT).orElse(null) == ProtectMode.ACTIVE));
+        table.set("protect", getter(() -> region.get().getFlags().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).getRegionData().get(Flag.FREEZE).isWithDefault(FreezeMode.ACTIVE)) return;
+                if (Region.getRegion(location).getFlags().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.getRegionData().has(Flag.COLOR).isReadable()) {
+            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
+                pasteBuilder.color(data.region.getFlags().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,7 +26,6 @@ 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;
@@ -52,7 +51,6 @@ 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))
@@ -73,8 +71,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.getRegionData().has(Flag.COLOR).isReadable()) {
+            if (data.region.getFlags().has(Flag.COLOR).isReadable()) {
-                pasteBuilder.color(data.region.getRegionData().get(Flag.COLOR).getWithDefault());
+                pasteBuilder.color(data.region.getFlags().get(Flag.COLOR).getWithDefault());
             }
             data.region.getTestblockArea().reset(pasteBuilder, true);
         } catch (SecurityException e) {

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

@@ -20,14 +20,17 @@
 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;
@@ -36,45 +39,44 @@ import yapion.parser.options.StreamOptions;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
+import java.util.*;
-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;
 
-@UtilityClass
+@Linked
-public class LaufbauUtils {
+public class LaufbauUtils implements Listener {
 
-    public static class LaufbauComponent implements SWPlayer.Component {
+    private static Map<Player, YAPIONObject> yapionObjectMap = new HashMap<>();
 
-        private YAPIONObject yapionObject = new YAPIONObject();
+    @EventHandler
-
+    @SneakyThrows
-        @Override
+    public void onPlayerJoin(PlayerJoinEvent event) {
-        @SneakyThrows
+        String config = UserConfig.getConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
-        public void onMount(SWPlayer player) {
+        if (config == null) {
-            String config = UserConfig.getConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
+            return;
-            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();
         }
+        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);
+    }
 
-        @Override
+    @EventHandler
-        @SneakyThrows
+    @SneakyThrows
-        public void onUnmount(SWPlayer player) {
+    public void onPlayerQuit(PlayerQuitEvent event) {
-            if (yapionObject.isEmpty()) {
+        YAPIONObject yapionObject = yapionObjectMap.get(event.getPlayer());
-                UserConfig.removePlayerConfig(player.getPlayer().getUniqueId(), "bausystem-laufbau");
+        if (yapionObject == null) {
-                return;
+            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()));
         }
+        if (yapionObject.isEmpty()) {
+            UserConfig.removePlayerConfig(event.getPlayer().getUniqueId(), "bausystem-laufbau");
+            return;
+        }
+        @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) {
@@ -123,7 +125,11 @@ public class LaufbauUtils {
             return false;
         }
         String identifier = identifier(bb);
-        return SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject.containsKey(identifier);
+        YAPIONObject yapionObject = yapionObjectMap.get(p);
+        if (yapionObject == null) {
+            return false;
+        }
+        return yapionObject.containsKey(identifier);
     }
 
     @SneakyThrows
@@ -132,7 +138,11 @@ public class LaufbauUtils {
             return;
         }
         String identifier = identifier(bb);
-        YAPIONObject yapionObject = SWPlayer.of(p).getComponentOrDefault(LaufbauComponent.class, LaufbauComponent::new).yapionObject;
+        YAPIONObject yapionObject = yapionObjectMap.get(p);
+        if (yapionObject == null) {
+            yapionObject = new YAPIONObject();
+            yapionObjectMap.put(p, 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.SPECTATOR.hasPermission(player)) {
+                if (player != null && Permission.REAL_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.SPECTATOR::hasPermission)
+                        .filter(Permission.REAL_SPECTATOR::hasPermission)
                         .map(Player::getName)
                         .collect(Collectors.toList());
             }

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

@@ -22,7 +22,6 @@ 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;
@@ -35,7 +34,6 @@ 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/tntlistener/TLSCommand.java

@@ -17,7 +17,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tls;
+package de.steamwar.bausystem.features.tntlistener;
 
 import de.steamwar.command.SWCommand;
 import de.steamwar.linkage.Linked;
@@ -43,13 +43,4 @@ 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/tntlistener/TLSListener.java

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

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

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

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

@@ -20,7 +20,6 @@ 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;
@@ -40,11 +39,10 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void genericCommand(final Player p) {
-        SWPlayer swPlayer = SWPlayer.of(p);
+		if (NoClipCommand.getNOCLIPS().contains(p)) {
-        if (swPlayer.hasComponent(NoClipCommand.NoClipData.class)) {
+			p.performCommand("noclip");
-            swPlayer.removeComponent(NoClipCommand.NoClipData.class);
+			return;
-            return;
+		}
-        }
 		if (p.getGameMode() == GameMode.CREATIVE) {
 			p.setGameMode(GameMode.SPECTATOR);
 		} else {
@@ -54,7 +52,9 @@ public class GamemodeCommand extends SWCommand {
 
 	@Register
 	public void gamemodeCommand(final Player p, final GameMode gameMode) {
-        SWPlayer.of(p).removeComponent(NoClipCommand.NoClipData.class);
+		if (NoClipCommand.getNOCLIPS().contains(p)) {
+			p.performCommand("noclip");
+		}
 		p.setGameMode(gameMode);
 	}
 }

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

@@ -26,7 +26,6 @@ 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;
@@ -57,9 +56,11 @@ public class MaterialCommand extends SWCommand implements Listener {
         WorldEditListener.addCommandExclusion("material");
     }
 
+    private Map<Player, Search> searchMap = new HashMap<>();
+
     @Getter
     @Setter
-    public class SearchParameter implements SWPlayer.Component {
+    static class Search {
         SearchType transparent = SearchType.IGNORE;
         SearchType solid = SearchType.IGNORE;
         SearchType gravity = SearchType.IGNORE;
@@ -103,10 +104,10 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void materialGUI(Player p) {
-        materialGUI(p, SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new));
+        materialGUI(p, searchMap.get(p));
     }
 
-    private static final Map<String, BiConsumer<SearchParameter, SearchType>> elements = new HashMap<>();
+    private static final Map<String, BiConsumer<Search, SearchType>> elements = new HashMap<>();
     static {
         elements.put("-transparent", (search, searchType) -> search.transparent = searchType);
         elements.put("-solid", (search, searchType) -> search.solid = searchType);
@@ -121,15 +122,15 @@ public class MaterialCommand extends SWCommand implements Listener {
 
     @Register
     public void search(Player p, @Mapper("search") String... searches) {
-        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
+        Search search = new Search();
         for (String s : searches) {
             boolean has = false;
-            for (Map.Entry<String, BiConsumer<SearchParameter, SearchType>> element: elements.entrySet()) {
+            for (Map.Entry<String, BiConsumer<Search, SearchType>> element: elements.entrySet()) {
                 if (s.startsWith(element.getKey() + ":")) {
-                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
+                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().length() + 1).toUpperCase()));
                     has = true;
                 } else if (s.startsWith(element.getKey().substring(0, 2) + ":")) {
-                    element.getValue().accept(searchParameter, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
+                    element.getValue().accept(search, SearchType.valueOf(s.substring(element.getKey().substring(0, 2).length() + 1).toUpperCase()));
                     has = true;
                 }
                 if (has) break;
@@ -140,15 +141,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+)?))*")) {
-                        searchParameter.blastResistance = s;
+                        search.blastResistance = s;
                     }
                     break;
                 default:
-                    searchParameter.name = s;
+                    search.name = s;
                     break;
             }
         }
-        materialGUI(p, searchParameter);
+        materialGUI(p, search);
     }
 
     @Mapper(value = "search", local = true)
@@ -181,7 +182,7 @@ public class MaterialCommand extends SWCommand implements Listener {
         };
     }
 
-    public void materialGUI(Player p, SearchParameter search) {
+    public void materialGUI(Player p, Search search) {
         List<SWListInv.SWListEntry<Material>> swListEntries = new ArrayList<>();
         MaterialLazyInit.materialData.forEach(data -> {
             if (data.is(search)) {
@@ -201,59 +202,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));
-        SearchParameter searchParameter = SWPlayer.of(p).getComponentOrDefault(SearchParameter.class, SearchParameter::new);
+        Search search = searchMap.get(p);
         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, searchParameter.name), clickType -> {
+        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), searchParameter.name);
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_NAME", p), search.name);
             swAnvilInv.setCallback(s -> {
-                searchParameter.name = s;
+                search.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(searchParameter.transparent.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.transparent = searchParameter.transparent.next();
+            search.transparent = search.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(searchParameter.solid.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.solid = searchParameter.solid.next();
+            search.solid = search.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(searchParameter.gravity.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.gravity = searchParameter.gravity.next();
+            search.gravity = search.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(searchParameter.occluding.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.occluding = searchParameter.occluding.next();
+            search.occluding = search.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(searchParameter.interacteable.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.interacteable = searchParameter.interacteable.next();
+            search.interacteable = search.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(searchParameter.flammable.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.flammable = searchParameter.flammable.next();
+            search.flammable = search.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(searchParameter.burnable.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.burnable = searchParameter.burnable.next();
+            search.burnable = search.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(searchParameter.waterloggable.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.waterloggable = searchParameter.waterloggable.next();
+            search.waterloggable = search.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(searchParameter.unmoveable.getChatValue(), p)), clickType -> {
+        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 -> {
-            searchParameter.unmoveable = searchParameter.unmoveable.next();
+            search.unmoveable = search.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, searchParameter.blastResistance), clickType -> {
+        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), searchParameter.blastResistance);
+            SWAnvilInv swAnvilInv = new SWAnvilInv(p, BauSystem.MESSAGE.parse("MATERIAL_SEARCH_BLASTRESISTANCE", p), search.blastResistance);
             swAnvilInv.setCallback(s -> {
                 if (s.isEmpty() || s.matches("((([><]=?)|!|=)\\d+(\\.|,\\d+)?)( ((([><]=?)|!|=)\\d+(\\.|,\\d+)?))*")) {
-                    searchParameter.blastResistance = s;
+                    search.blastResistance = s;
                 }
                 searchGUI(p);
             });
@@ -261,4 +262,14 @@ 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.SearchParameter search) {
+        public boolean is(MaterialCommand.Search 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,6 +40,10 @@ 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
@@ -55,34 +59,29 @@ 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");
 
-    public static class NoClipData implements SWPlayer.Component {
+    @Getter
-        private long lastTick = -1;
+    private static final List<Player> NOCLIPS = new ArrayList<>();
-
+    private static final Map<Player, Long> LAST_TICKS = new HashMap<>();
-        @Override
-        public void onUnmount(SWPlayer player) {
-            player.setGameMode(GameMode.CREATIVE);
-        }
-    }
 
     public NoClipCommand() {
         super("noclip", "nc");
 
         BiFunction<Player, Object, Object> first = (player, o) -> {
-            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (NOCLIPS.contains(player)) {
-            if (noClipData == null) return o;
+                if (LAST_TICKS.getOrDefault(player, -1L).equals(TPSUtils.currentTick.get())) return o;
-            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
+                NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
-            NMSWrapper.impl.setInternalGameMode(player, GameMode.SPECTATOR);
+                LAST_TICKS.put(player, TPSUtils.currentTick.get());
-            noClipData.lastTick = TPSUtils.currentTick.get();
+            }
             return o;
         };
         TinyProtocol.instance.addFilter(position, first);
         TinyProtocol.instance.addFilter(positionLook, first);
 
         BiFunction<Player, Object, Object> second = (player, o) -> {
-            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
+            if (NOCLIPS.contains(player)) {
-            if (noClipData == null) return o;
+                NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
-            NMSWrapper.impl.setInternalGameMode(player, GameMode.CREATIVE);
+                LAST_TICKS.put(player, TPSUtils.currentTick.get());
-            noClipData.lastTick = TPSUtils.currentTick.get();
+            }
             return o;
         };
         TinyProtocol.instance.addFilter(useItem, second);
@@ -90,7 +89,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         TinyProtocol.instance.addFilter(windowClick, second);
 
         BiFunction<Player, Object, Object> third = (player, o) -> {
-            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
+            if (NOCLIPS.contains(player)) {
                 NMSWrapper.impl.setSlotToItemStack(player, o);
             }
             return o;
@@ -100,9 +99,9 @@ public class NoClipCommand extends SWCommand implements Listener {
 
     @Register(help = true)
     public void genericCommand(@Validator Player player) {
-        SWPlayer swPlayer = SWPlayer.of(player);
+        if (NOCLIPS.contains(player)) {
-        if (swPlayer.hasComponent(NoClipData.class)) {
+            NOCLIPS.remove(player);
-            swPlayer.removeComponent(NoClipData.class);
+            player.setGameMode(GameMode.CREATIVE);
         } else {
             player.setGameMode(GameMode.SPECTATOR);
             NMSWrapper.impl.setPlayerBuildAbilities(player);
@@ -111,7 +110,7 @@ public class NoClipCommand extends SWCommand implements Listener {
             NMSWrapper.impl.setGameStateChangeReason(gameStateChangeObject);
             floatFieldAccessor.set(gameStateChangeObject, 1F);
             
-            swPlayer.setComponent(new NoClipData());
+            NOCLIPS.add(player);
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
             TinyProtocol.instance.sendPacket(player, gameStateChangeObject);
             pseudoGameMode(player, GameMode.SPECTATOR);
@@ -121,27 +120,30 @@ public class NoClipCommand extends SWCommand implements Listener {
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
         event.getNewSpectator().forEach(player -> {
-            SWPlayer.of(player).removeComponent(NoClipData.class);
+            if (NOCLIPS.contains(player)) {
+                NOCLIPS.remove(player);
+                player.setGameMode(GameMode.CREATIVE);
+            }
         });
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setCancelled(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onBlock(BlockCanBuildEvent event) {
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setBuildable(true);
         }
     }
 
     @EventHandler(ignoreCancelled = true)
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             event.setCancelled(true);
             event.getPlayer().setFlying(true);
         }
@@ -152,7 +154,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
             return;
         }
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
+        if (NOCLIPS.contains(event.getPlayer())) {
             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,7 +24,6 @@ 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;
@@ -36,11 +35,15 @@ 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);
     }
@@ -55,13 +58,13 @@ public class SelectBauGuiItem extends BauGuiItem {
 
     private static void selectFinish(Player p, RegionType type, RegionExtensionType extensionType) {
         p.closeInventory();
-        SWPlayer.of(p).setComponent(new LastSelect(type, extensionType));
+        LAST_SELECT_MAP.put(p, new LastSelect(type, extensionType));
         p.performCommand("select " + type.name() + " " + extensionType.toString());
     }
 
     @Override
     public ItemStack getItem(Player player) {
-        LastSelect last = SWPlayer.of(player).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+        LastSelect last = LAST_SELECT_MAP.getOrDefault(player, 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();
     }
@@ -77,7 +80,7 @@ public class SelectBauGuiItem extends BauGuiItem {
             inv.open();
         } else {
             p.closeInventory();
-            LastSelect last = SWPlayer.of(p).getComponentOrDefault(LastSelect.class, () -> new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
+            LastSelect last = LAST_SELECT_MAP.getOrDefault(p, new LastSelect(RegionType.BUILD, RegionExtensionType.NORMAL));
             p.performCommand("select " + last.getType().name() + " " + last.getExtensionType().toString());
         }
         return false;
@@ -89,7 +92,7 @@ public class SelectBauGuiItem extends BauGuiItem {
     }
 
     @AllArgsConstructor
-    private static class LastSelect implements SWPlayer.Component {
+    private static class LastSelect {
         @Getter
         private final RegionType type;
         @Getter

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

@@ -21,7 +21,6 @@ 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;
@@ -31,10 +30,7 @@ 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.PlayerInteractEvent;
+import org.bukkit.event.player.*;
-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;
 
@@ -46,21 +42,8 @@ import java.util.Map;
 @Linked
 public class WarpListener implements Listener {
 
-    public static class WarpComponent implements SWPlayer.Component {
+    private Map<Player, REntityServer> warpEntityServer = new HashMap<>();
-        private REntityServer server;
+    private Map<Player, List<Location>> selected = new HashMap<>();
-        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) {
@@ -82,11 +65,20 @@ public class WarpListener implements Listener {
     }
 
     private void reshow(Player p, Material material, boolean sneaking) {
-        SWPlayer swPlayer = SWPlayer.of(p);
+        REntityServer entityServer = warpEntityServer.get(p);
-        swPlayer.removeComponent(WarpComponent.class);
+        if (entityServer != null) {
-        if (material != Material.COMPASS) return;
+            entityServer.close();
+        }
+        if (material != Material.COMPASS) {
+            warpEntityServer.remove(p);
+            return;
+        }
+
+        selected.remove(p);
+        entityServer = new REntityServer();
+        entityServer.addPlayer(p);
+        warpEntityServer.put(p, entityServer);
 
-        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<>();
@@ -107,9 +99,12 @@ 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));
@@ -117,9 +112,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;
-                warpComponent.selected.add(location);
+                selected.computeIfAbsent(p, player -> new ArrayList<>()).add(location);
             }
-            RArmorStand armorStand = new RArmorStand(warpComponent.server, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
+            RArmorStand armorStand = new RArmorStand(finalEntityServer, position.toLocation(p.getWorld()), RArmorStand.Size.MARKER);
             armorStand.setDisplayName(name);
             armorStand.setNoGravity(true);
             armorStand.setInvisible(true);
@@ -128,13 +123,28 @@ 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.getPlayer().getInventory().getItemInMainHand().getType() != Material.COMPASS) {
-        if (event.getAction() != Action.RIGHT_CLICK_AIR) return;
+            return;
-        WarpComponent warpComponent = SWPlayer.of(event.getPlayer()).getComponent(WarpComponent.class).orElse(null);
+        }
-        if (warpComponent == null || warpComponent.selected.size() != 1) return;
+        if (event.getAction() != Action.RIGHT_CLICK_AIR) {
-        Location location = warpComponent.selected.get(0);
+            return;
+        }
+        List<Location> locations = selected.getOrDefault(event.getPlayer(), new ArrayList<>());
+        if (locations.size() != 1) {
+            return;
+        }
+        Location location = locations.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,14 +59,18 @@ public class BauMemberUpdate extends PacketHandler implements Listener {
         Set<Player> newSpectator = new HashSet<>();
         Set<Player> newBuilder = new HashSet<>();
         Bukkit.getOnlinePlayers().forEach(player -> {
-            if (Permission.SPECTATOR.hasPermission(player)) {
+            if (Permission.REAL_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.getRegionData().has(Flag.COLOR).isReadable()) {
+                if (region.getFlags().has(Flag.COLOR).isReadable()) {
-                    colorCode = "§" + region.getRegionData().get(Flag.COLOR).orElse(ColorMode.PINK).getColorCode();
+                    colorCode = "§" + region.getFlags().get(Flag.COLOR).orElse(ColorMode.PINK).getColorCode();
                 }
                 return colorCode + "■ §eSteam§8War " + colorCode + "■"; // ■
             }

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

@@ -0,0 +1,43 @@
+/*
+ *   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,7 +49,6 @@ 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 {
@@ -101,20 +100,10 @@ public class SpectatorListener implements Listener {
         materials.add(Material.WATER);
         materials.remove(Material.BARRIER);
         materials.remove(Material.STONE);
-        techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
+        TechHider techHider = new TechHider((TechHider.LocationEvaluator) (player, i, i1) -> {
-            return Permission.BUILD.hasPermission(player) || NO_TECHHIDER.contains(player);
+            return Permission.BUILD.hasPermission(player) || Permission.isTempOnlySpectator(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) {
@@ -124,7 +113,6 @@ public class SpectatorListener implements Listener {
             NO_TECHHIDER.add(player);
         }
         resendChunks(player);
-        enableOrDisableTechhider();
     }
 
     private static void resendChunks(Player player) {
@@ -143,7 +131,6 @@ 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;
@@ -165,7 +152,6 @@ public class SpectatorListener implements Listener {
 
     @EventHandler
     public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        enableOrDisableTechhider();
         if (!anySupervisorOnline(null) && !BauSystem.DEV_SERVER) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 player.kickPlayer("");
@@ -175,6 +161,7 @@ public class SpectatorListener implements Listener {
 
         event.getChanged().forEach(player -> {
             NO_TECHHIDER.remove(player);
+            if (Permission.isTempOnlySpectator(player)) return;
             resendChunks(player);
         });
     }
@@ -182,7 +169,6 @@ 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

@@ -23,7 +23,6 @@ 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.SWPlayer;
 import de.steamwar.core.WorldEditRenderer;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
@@ -36,10 +35,13 @@ 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;
 
@@ -69,23 +71,32 @@ public class SelectAdjacent implements Listener {
             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();
-        Selector selector;
         if (material.isAir()) {
             selector = new Selector(event.getClickedBlock(), event.getPlayer(), __ -> true);
         } else {
             selector = new Selector(event.getClickedBlock(), event.getPlayer(), type -> type == material);
         }
-        SWPlayer.of(event.getPlayer()).setComponent(selector);
+        selectors.put(event.getPlayer(), selector);
     }
 
-    private class Selector implements SWPlayer.Component {
+    @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;
 
@@ -143,7 +154,6 @@ public class SelectAdjacent implements Listener {
                 if (toCalc.isEmpty() || seen.size() > MAX_BLOCKS) {
                     bukkitTask.cancel();
                     player.sendTitle("§aDone", "§e" + volume + " §7Blocks", 0, 20, 5);
-                    SWPlayer.of(player).removeComponent(Selector.class);
                 }
             }, 1, 1);
         }
@@ -180,10 +190,5 @@ public class SelectAdjacent implements Listener {
                 }
             }
         }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            cancel();
-        }
     }
 }

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);
-                }, 0);
+                }, 1L);
                 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.getRegionData().has(Flag.CHANGED).isReadable())
+                        .filter(region -> region.getFlags().has(Flag.CHANGED).isReadable())
-                        .filter(region -> region.getRegionData().get(Flag.CHANGED).isWithDefault(ChangedMode.HAS_CHANGE))
+                        .filter(region -> region.getFlags().get(Flag.CHANGED).getWithDefault() == 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.getRegionData().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
+                    region.getFlags().set(Flag.CHANGED, ChangedMode.NO_CHANGE);
                 }
             }
         }.runTaskTimer(BauSystem.getInstance(), 0, 20 * 60);

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

@@ -0,0 +1,43 @@
+/*
+ *   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,6 +23,7 @@ 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;
@@ -54,7 +55,7 @@ public interface Region {
     RegionType getType();
 
     @NonNull
-    RegionData getRegionData();
+    FlagStorage getFlags();
 
     @NonNull
     Area getArea();
@@ -74,6 +75,9 @@ 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 RegionData data;
+        private final FlagStorage flags;
 
         @CheckReturnValue
         public abstract boolean load();

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

@@ -19,134 +19,75 @@
 
 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.ArrayList;
+import java.util.Objects;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
 
-public abstract class RegionData {
+public interface RegionData {
 
-    private final List<Property<?, ?>> properties = new ArrayList<>();
+    void clear();
 
-    protected final YAPIONObject data;
+    SchematicNode getTestblockSchematic();
-    protected final YAPIONObject flagData;
-    protected final Runnable onChange;
-    protected final Map<Flag<?>, Flag.Value<?>> flagMap = new HashMap<>();
 
-    private final class Property<T, K> {
+    void setTestblockSchematic(SchematicNode schematic);
-        private final String field;
-        private final Function<K, T> loader;
-        private final Function<T, K> writer;
 
-        private T value;
+    RegionData EMPTY = new RegionData() {
 
-        public Property(String field, Function<K, T> loader, Function<T, K> writer) {
+        @Override
-            this.field = field;
+        public void clear() {
-            this.loader = loader;
-            this.writer = writer;
-            properties.add(this);
         }
 
-        public void load() {
+        @Override
-            if (flagData.containsKey(field)) {
+        public SchematicNode getTestblockSchematic() {
-                value = loader.apply(flagData.getPlainValue(field));
+            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");
             } else {
-                value = null;
+                yapionObject.put("testblockSchematic", testblockSchematic.getId());
             }
+            onChange.run();
         }
-
-        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));
-            }
-        }
-    }
-
-    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_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedFlagStorage.java

@@ -0,0 +1,106 @@
+/*
+ *   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

@@ -0,0 +1,113 @@
+/*
+ *   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 +
+                '}';
+    }
+}

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

@@ -41,7 +41,7 @@ public final class FixedGlobalRegion implements Region {
     private static final Point MAX_POINT = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE);
 
     @Setter
-    private static RegionData FLAG_STORAGE;
+    private static FlagStorage FLAG_STORAGE;
 
     private static final UUID GLOBAL_REGION_ID = new UUID(0, 0);
 
@@ -106,7 +106,7 @@ public final class FixedGlobalRegion implements Region {
     }
 
     @Override
-    public @NonNull RegionData getRegionData() {
+    public @NonNull FlagStorage getFlags() {
         return FLAG_STORAGE;
     }
 
@@ -139,4 +139,9 @@ public final class FixedGlobalRegion implements Region {
     public @NonNull RegionBackups getBackups() {
         return RegionBackups.EMPTY;
     }
+
+    @Override
+    public @NonNull RegionData getRegionData() {
+        return RegionData.EMPTY;
+    }
 }

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

@@ -1,58 +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.RegionData;
-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.core.Core;
-import lombok.NonNull;
-import yapion.hierarchy.types.YAPIONObject;
-
-public class FixedGlobalRegionData extends RegionData {
-
-    public FixedGlobalRegionData(YAPIONObject data, Runnable onChange) {
-        super(data, onChange);
-    }
-
-    @Override
-    protected void initialize() {
-        flagMap.put(Flag.TNT, TNTMode.DENY);
-        flagMap.put(Flag.COLOR, ColorMode.YELLOW);
-        flagMap.put(Flag.PROTECT, ProtectMode.INACTIVE);
-    }
-
-    @Override
-    public @NonNull <T extends Enum<T> & Flag.Value<T>> RegionFlagPolicy has(@NonNull Flag<T> flag) {
-        if (flag.oneOf(Flag.COLOR, Flag.PROTECT)) {
-            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;
-    }
-}

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

@@ -26,6 +26,7 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.TestblockMode;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
 import de.steamwar.bausystem.utils.PasteBuilder;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.Core;
 import de.steamwar.sql.GameModeConfig;
 import de.steamwar.sql.SchematicType;
@@ -49,7 +50,7 @@ public class FixedRegion implements Region {
 
     private final String name;
     private final UUID uuid;
-    private final FixedRegionData flagStorage;
+    private final FixedFlagStorage flagStorage;
     private final Prototype prototype;
     private final String skin;
 
@@ -59,6 +60,7 @@ public class FixedRegion implements Region {
     private final int floorLevel;
     private final int waterLevel;
     private final GameModeConfig<Material, String> gameModeConfig;
+    private final RegionData regionData;
     private final RegionHistory regionHistory = new RegionHistory.Impl(20);
 
     private final RegionBackups regionBackups = new RegionBackups() {
@@ -139,7 +141,7 @@ public class FixedRegion implements Region {
         }
     }
 
-    public FixedRegion(String name, FixedRegionData flagStorage, Prototype prototype, YAPIONObject regionConfig, YAPIONObject regionData) {
+    public FixedRegion(String name, FixedFlagStorage flagStorage, Prototype prototype, YAPIONObject regionConfig, YAPIONObject regionData) {
         this.name = name;
         uuid = UUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8));
         this.flagStorage = flagStorage;
@@ -341,6 +343,7 @@ public class FixedRegion implements Region {
         } else {
             this.gameModeConfig = GameModeConfig.getByFileName(found);
         }
+        this.regionData = new RegionData.RegionDataImpl(regionData, WorldData::write);
     }
 
     @Override
@@ -354,7 +357,7 @@ public class FixedRegion implements Region {
     }
 
     @Override
-    public @NonNull RegionData getRegionData() {
+    public @NonNull FlagStorage getFlags() {
         return flagStorage;
     }
 
@@ -387,4 +390,9 @@ public class FixedRegion implements Region {
     public @NonNull RegionBackups getBackups() {
         return regionBackups;
     }
+
+    @Override
+    public @NonNull RegionData getRegionData() {
+        return regionData;
+    }
 }

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

@@ -1,48 +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.RegionData;
-import de.steamwar.bausystem.region.RegionFlagPolicy;
-import de.steamwar.bausystem.region.flags.Flag;
-import de.steamwar.core.Core;
-import lombok.NonNull;
-import yapion.hierarchy.types.YAPIONObject;
-
-public class FixedRegionData extends RegionData {
-
-    public FixedRegionData(YAPIONObject data, Runnable onChange) {
-        super(data, onChange);
-    }
-
-    @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;
-    }
-}

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

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.region.fixed;
 
 import de.steamwar.bausystem.region.FixedRegionSystem;
-import de.steamwar.bausystem.worlddata.WorldData;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import yapion.hierarchy.types.YAPIONObject;
@@ -217,7 +216,7 @@ public class Prototype {
         } else {
             prototype = PROTOTYPE_MAP.get(regionConfig.getPlainValue("prototype"));
         }
-        FixedRegionData flagStorage = new FixedRegionData(regionData, WorldData::write);
+        FixedFlagStorage flagStorage = new FixedFlagStorage(regionData.getObjectOrSetDefault("flagStorage", new YAPIONObject()));
         FixedRegionSystem.addRegion(new FixedRegion(name, flagStorage, prototype, regionConfig, regionData));
     }
 }

BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/loader/RegionLoader.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.region.fixed.loader;
 
-import de.steamwar.bausystem.region.fixed.FixedGlobalRegionData;
+import de.steamwar.bausystem.region.fixed.FixedGlobalFlagStorage;
 import de.steamwar.bausystem.region.fixed.FixedGlobalRegion;
 import de.steamwar.bausystem.region.fixed.Prototype;
 import de.steamwar.bausystem.worlddata.WorldData;
@@ -80,6 +80,6 @@ public class RegionLoader {
             globalOptions = new YAPIONObject();
             optionsYapionObject.add("global", globalOptions);
         }
-        FixedGlobalRegion.setFLAG_STORAGE(new FixedGlobalRegionData(globalOptions, WorldData::write));
+        FixedGlobalRegion.setFLAG_STORAGE(new FixedGlobalFlagStorage(globalOptions.getObjectOrSetDefault("flagStorage", new YAPIONObject())));
     }
 }

CommandFramework-Old/build.gradle.kts

@@ -0,0 +1,27 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2024  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/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+    testImplementation(libs.junit)
+    testImplementation(libs.hamcrest)
+}