Revert "Fix CraftbukkitWrapper20"

This reverts commit db3f98209e.

.gitignore

@@ -21,4 +21,3 @@ lib
 /WebsiteBackend/logs
 /WebsiteBackend/skins
 /WebsiteBackend/config.json
-/WebsiteBackend/sessions

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -52,9 +52,6 @@ FLAG_ITEMS=Items
 FLAG_NO_GRAVITY = No Gravity
 FLAG_TESTBLOCK=Testblock
 FLAG_CHANGED=Changed
-FLAG_WATER_DESTROY=Water Destroy
-FLAG_WATER_DESTROY_ALLOW=§coff
-FLAG_WATER_DESTROY_DENY=§aon
 FLAG_FIRE_ALLOW=§con
 FLAG_FIRE_DENY=§aoff
 FLAG_FREEZE_ACTIVE=§aon
@@ -143,7 +140,6 @@ BAU_INFO_ITEM_LORE_ITEMS=§7Items§8: §e{0}
 BAU_INFO_ITEM_LORE_NO_GRAVITY = §7NoGravity§8: §e{0}
 BAU_INFO_ITEM_LORE_TESTBLOCK=§7Testblock§8: §e{0}
 BAU_INFO_ITEM_LORE_CHANGED=§7Changed§8: §e{0}
-BAU_INFO_ITEM_LORE_WATER_DESTROY=§7Water Destroy§8: §e{0}
 BAU_INFO_COMMAND_HELP=§8/§ebauinfo §8- §7Information regarding this build server
 BAU_INFO_COMMAND_OWNER=§7Owner§8: §e{0}
 BAU_INFO_COMMAND_MEMBER=§7{0} §8[§7{1}§8]§8: §e{2}
@@ -760,9 +756,6 @@ REGION_FIRE_DISABLED=§aFire damage activated in this region
 REGION_FREEZE_HELP=§8/§efreeze §8- §7Toggle Freeze
 REGION_FREEZE_ENABLED=§cRegion frozen
 REGION_FREEZE_DISABLED=§aRegion thawed
-REGION_WATER_HELP=§8/§ewaterdestroy §8- §7Toggle water damage
-REGION_WATER_ENABLED=§aWater damage deactivated in this region
-REGION_WATER_DISABLED=§cWater damage activated in this region
 REGION_ITEMS_HELP=§8/§eitems §8- §7Toggle Items
 REGION_ITEMS_ENABLED=§aItems enabled in this region
 REGION_ITEMS_DISABLED=§cItems disabled in this region

BauSystem/BauSystem_Main/src/BauSystem_de.properties

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

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

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

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/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/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/observer/ObserverTracerListener.java

@@ -46,8 +46,8 @@ public class ObserverTracerListener implements Listener {
     public ObserverTracerListener() {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                if (pair.getPlayer().getGameMode() != GameMode.SPECTATOR) return;
+                if (pair.getKey().getGameMode() != GameMode.SPECTATOR) return;
-                pair.getComponent().show();
+                pair.getValue().show();
             });
         }, 15L, 15L);
     }
@@ -64,7 +64,7 @@ public class ObserverTracerListener implements Listener {
                     createNew(event);
                 }
                 SWPlayer.allWithSingleComponent(ObserverTracer.class).forEach(pair -> {
-                    pair.getComponent().trace();
+                    pair.getValue().trace();
                 });
             }, 1L);
         } else {

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

@@ -44,7 +44,7 @@ public class TNTListener implements Listener, ScoreboardElement {
     private void explode(List<Block> blockList, boolean destroy) {
         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);
@@ -86,7 +86,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

@@ -119,7 +119,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/WaterDestroyCommand.java

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

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

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

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

@@ -84,14 +84,14 @@ public class ColorBauGuiItem extends BauGuiItem {
     @Override
     public ItemStack getItem(Player player) {
         Region region = Region.getRegion(player.getLocation());
-        ColorMode mode = region.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/event/EventListener.java

@@ -51,8 +51,8 @@ public class EventListener implements Listener {
         Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), () -> {
             long millis = System.currentTimeMillis();
             SWPlayer.allWithSingleComponent(ScriptRunner.ScriptData.class)
-                    .filter(pair -> millis - pair.getComponent().getLastF() > 200)
+                    .filter(pair -> millis - pair.getValue().getLastF() > 200)
-                    .forEach(pair -> pair.getComponent().setLastF(Long.MAX_VALUE));
+                    .forEach(pair -> pair.getValue().setLastF(Long.MAX_VALUE));
         }, 1, 1);
     }
 

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

@@ -73,8 +73,8 @@ public class StabGenerator extends StabStep implements Listener {
         try {
             PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
             PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider);
-            if (data.region.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/tracer/TraceManager.java

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

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/worldedit/mask/above/FAWEAboveMaskParser.java

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

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

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

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

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

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

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

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

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

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

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

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

@@ -17,17 +17,27 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.core;
+package de.steamwar.bausystem.region;
 
-public class WorldIdentifier {
+import de.steamwar.bausystem.region.flags.Flag;
+import lombok.NonNull;
 
-    private static final IWorldIdentifier impl = VersionDependent.getVersionImpl(Core.getInstance());
+import java.util.Map;
 
-    public static void set(String name) {
+public interface FlagStorage {
-        impl.setResourceKey(name);
-    }
 
-    protected interface IWorldIdentifier {
+    @NonNull
-        void setResourceKey(String name);
+    <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_Main/src/de/steamwar/bausystem/region/flags/Flag.java

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

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

@@ -1,56 +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.flags;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum WaterDestroyMode implements Flag.Value<WaterDestroyMode> {
-
-    ALLOW("FLAG_WATER_DESTROY_ALLOW"),
-    DENY("FLAG_WATER_DESTROY_DENY");
-
-    private static WaterDestroyMode[] values;
-    private final String chatValue;
-
-    @Override
-    public WaterDestroyMode[] getValues() {
-        if (WaterDestroyMode.values == null) {
-            WaterDestroyMode.values = WaterDestroyMode.values();
-        }
-        return WaterDestroyMode.values;
-    }
-
-    @Override
-    public WaterDestroyMode getValue() {
-        return this;
-    }
-
-    @Override
-    public WaterDestroyMode getValueOf(final String name) {
-        try {
-            return WaterDestroyMode.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            return ALLOW;
-        }
-    }
-}

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

@@ -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, Flag.WATER_DESTROY)) {
-            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())));
     }
 }

CommonCore/Linkage/src/de/steamwar/linkage/AbstractLinker.java

@@ -56,9 +56,7 @@ public abstract class AbstractLinker<T> {
                     .map(s -> {
                         try {
                             return Class.forName(s, false, plugin.getClass().getClassLoader());
-                        } catch (NoClassDefFoundError error) {
+                        } catch (ClassNotFoundException | NoClassDefFoundError e) {
-                            return null;
-                        } catch (ClassNotFoundException e) {
                             throw new SecurityException(e.getMessage(), e);
                         }
                     })

CommonCore/SQL/src/de/steamwar/sql/EventFight.kt

@@ -151,9 +151,9 @@ class EventFight(id: EntityID<Int>) : IntEntity(id), Comparable<EventFight> {
     val dependents by lazy { useDb { EventRelation.getFightRelations(this@EventFight).toList() } }
 
     val winner: Team?
-        get() = useDb { if (ergebnis == 1) Team[teamBlue] else if (ergebnis == 2) Team[teamRed] else null }
+        get() = if (ergebnis == 1) Team[teamBlue] else if (ergebnis == 2) Team[teamRed] else null
     val losser: Team?
-        get() = useDb { if (ergebnis == 1) Team[teamRed] else if (ergebnis == 2) Team[teamBlue] else null }
+        get() = if (ergebnis == 1) Team[teamRed] else if (ergebnis == 2) Team[teamBlue] else null
 
     fun setGroup(group: Int?) = useDb { groupId = group?.let { EntityID(it, EventGroupTable) } }
     fun hasFinished() = fight != null || ergebnis != 0

CommonCore/SQL/src/de/steamwar/sql/EventGroup.kt

@@ -90,7 +90,7 @@ class EventGroup(id: EntityID<Int>) : IntEntity(id) {
         set(value) {
             groupPointsPerDraw = value
         }
-    val dependents by lazy { EventRelation.getGroupRelations(this).toList() }
+    val dependents by lazy { EventRelation.getGroupRelations(this) }
     val lastFight by lazy { Optional.ofNullable(fights.maxByOrNull { it.startTime }) }
 
     fun getId() = id.value

CommonCore/SQL/src/de/steamwar/sql/EventRelation.kt

@@ -117,10 +117,10 @@ class EventRelation(id: EntityID<Int>) : IntEntity(id) {
         fromPlace = place
     }
 
-    fun getAdvancingTeam(): Team? = useDb { when(fromType) {
+    fun getAdvancingTeam(): Team? = when(fromType) {
         FromType.FIGHT -> if (fromPlace == 0) fromFight?.winner else fromFight?.losser
         FromType.GROUP -> fromGroup?.calculatePoints()?.toList()?.sortedBy { (_, v) -> v }?.reversed()?.elementAt(fromPlace)?.first
-    } }
+    }
 
     fun apply(): Boolean {
         val team = getAdvancingTeam() ?: return false

CommonCore/SQL/src/de/steamwar/sql/Leaderboard.kt

@@ -1,94 +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.sql
-
-import de.steamwar.sql.internal.useDb
-import org.jetbrains.exposed.v1.core.SortOrder
-import org.jetbrains.exposed.v1.core.and
-import org.jetbrains.exposed.v1.core.count
-import org.jetbrains.exposed.v1.core.dao.id.CompositeID
-import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
-import org.jetbrains.exposed.v1.core.dao.id.EntityID
-import org.jetbrains.exposed.v1.core.eq
-import org.jetbrains.exposed.v1.core.lessSubQuery
-import org.jetbrains.exposed.v1.dao.CompositeEntity
-import org.jetbrains.exposed.v1.dao.CompositeEntityClass
-import org.jetbrains.exposed.v1.dao.flushCache
-import org.jetbrains.exposed.v1.javatime.CurrentTimestamp
-import org.jetbrains.exposed.v1.javatime.timestamp
-import org.jetbrains.exposed.v1.jdbc.select
-import org.jetbrains.exposed.v1.jdbc.upsert
-
-object LeaderboardTable : CompositeIdTable("Leaderboard") {
-    val userId = reference("UserId", SteamwarUserTable)
-    val name = varchar("LeaderboardName", 64).entityId()
-    val time = long("Time")
-    val updatedAt = timestamp("UpdatedAt").defaultExpression(CurrentTimestamp)
-    val bestTime = bool("BestTime")
-
-    override val primaryKey = PrimaryKey(userId, name)
-
-    init {
-        addIdColumn(userId)
-    }
-}
-
-class Leaderboard(id: EntityID<CompositeID>) : CompositeEntity(id) {
-    companion object : CompositeEntityClass<Leaderboard>(LeaderboardTable) {
-        @JvmStatic
-        fun getLeaderboard(name: String) = useDb {
-            find { LeaderboardTable.name eq name }.orderBy(LeaderboardTable.time to SortOrder.ASC).limit(5).toList()
-        }
-
-        @JvmStatic
-        fun getPlayerTime(user: SteamwarUser, name: String) = useDb {
-            find { (LeaderboardTable.userId eq user.id.value) and (LeaderboardTable.name eq name) }.firstOrNull()
-        }
-
-        @JvmStatic
-        fun getPlayerPlacement(user: SteamwarUser, name: String) = useDb {
-            LeaderboardTable.select(LeaderboardTable.time.count())
-                .where {
-                    (LeaderboardTable.name eq name) and (LeaderboardTable.time lessSubQuery LeaderboardTable.select(
-                        LeaderboardTable.time
-                    ).where { (LeaderboardTable.userId eq user.id.value) and (LeaderboardTable.name eq name) })
-                }
-                .firstOrNull()?.get(LeaderboardTable.time.count())?.toInt() ?: Int.MAX_VALUE
-        }
-
-        @JvmStatic
-        fun upsert(userId: Int, name: String, time: Long, bestTime: Boolean) = useDb {
-            LeaderboardTable.upsert(
-                onUpdateExclude = listOf(LeaderboardTable.updatedAt, LeaderboardTable.userId, LeaderboardTable.name)
-            ) {
-                it[LeaderboardTable.userId] = userId
-                it[LeaderboardTable.name] = name
-                it[LeaderboardTable.time] = time
-                it[LeaderboardTable.bestTime] = bestTime
-            }
-        }
-    }
-
-    val user by LeaderboardTable.userId.transform({ EntityID(it, SteamwarUserTable) }, { it.value })
-    val name by LeaderboardTable.name
-    var time by LeaderboardTable.time
-    var updatedAt by LeaderboardTable.updatedAt
-    var bestTime by LeaderboardTable.bestTime
-}

CommonCore/SQL/src/de/steamwar/sql/NodeMember.kt

@@ -55,17 +55,6 @@ class NodeMember(id: EntityID<CompositeID>) : CompositeEntity(id) {
             getNodeMember(node, member) ?: throw IllegalStateException("NodeMember not created")
         }
 
-        @JvmStatic
-        fun createNodeMember(node: Int, member: Int, parent: SchematicNode): NodeMember = useDb {
-            if (!parent.isDir()) throw IllegalStateException("Parent must be a directory")
-            NodeMemberTable.insertIgnore {
-                it[this.node] = EntityID(node, SchematicNodeTable)
-                it[this.userId] = EntityID(member, SteamwarUserTable)
-                it[NodeMemberTable.parentNode] = parent.getId()
-            }
-            getNodeMember(node, member) ?: throw IllegalStateException("NodeMember not created")
-        }
-
         @JvmStatic
         fun createNodeMember(node: Int, member: SteamwarUser) = createNodeMember(node, member.id.value)
 
@@ -92,7 +81,6 @@ class NodeMember(id: EntityID<CompositeID>) : CompositeEntity(id) {
     var parent by NodeMemberTable.parentNode.transform(
         { it.map { EntityID(it, SchematicNodeTable) }.getOrNull() },
         { Optional.ofNullable(it?.value) })
-        private set
 
     fun setParentId(id: Int?) {
         parent = Optional.ofNullable(id)

CommonCore/SQL/src/de/steamwar/sql/PersonalKit.kt

@@ -33,8 +33,8 @@ object PersonalKitTable: CompositeIdTable("PersonalKit") {
     val userId = reference("UserId", SteamwarUserTable)
     val gamemode = varchar("Gamemode", 64).entityId()
     val kitName = varchar("Name", 64).entityId()
-    val inventory = text("Inventory", eagerLoading = true)
+    val inventory = text("Inventory")
-    val armor = text("Armor", eagerLoading = true)
+    val armor = text("Armor")
     val inUse = bool("InUse")
 
     override val primaryKey = PrimaryKey(userId, gamemode, kitName)
@@ -48,17 +48,14 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
     companion object: CompositeEntityClass<InternalKit>(PersonalKitTable) {
         @JvmStatic
         fun get(userId: Int, gamemode: String) = useDb {
-            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) }
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.inUse eq true) }
                 .toList()
         }
 
         @JvmStatic
         fun get(userId: Int, gamemode: String, kitName: String) = useDb {
-            findById(CompositeID {
+            find { PersonalKitTable.userId eq userId and (PersonalKitTable.gamemode eq gamemode) and (PersonalKitTable.kitName eq kitName) and (PersonalKitTable.inUse eq true) }
-                it[PersonalKitTable.userId] = EntityID(userId, SteamwarUserTable)
+                .firstOrNull()
-                it[PersonalKitTable.gamemode] = gamemode
-                it[PersonalKitTable.kitName] = kitName
-            })
         }
 
         @JvmStatic
@@ -70,10 +67,10 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
                     it[PersonalKitTable.kitName] = kitName
                 }
             ) {
-                this.rawInventory = rawInventory
+                this.inventory = rawInventory
-                this.rawArmor = rawArmor
+                this.armor = rawArmor
-                this.inUse = false
+                this.inUse = true
-            }.also { it.setDefault() }
+            }
         }
 
         @JvmStatic
@@ -110,7 +107,6 @@ class InternalKit(id: EntityID<CompositeID>): CompositeEntity(id) {
 
     fun setDefault() = useDb {
         find { PersonalKitTable.userId eq userID and (PersonalKitTable.gamemode eq gameMode) and (PersonalKitTable.inUse eq true) }
-            .filter { it.id.value != this@InternalKit.id.value }
             .forEach { it.inUse = false }
         inUse = true
     }

CommonCore/SQL/src/de/steamwar/sql/PollAnswer.kt

@@ -0,0 +1,78 @@
+/*
+ *   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.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.VarCharColumnType
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+
+object PollAnswerTable: CompositeIdTable("PollAnswer") {
+    val userId = reference("UserID", SteamwarUserTable)
+    val question = varchar("Question", 150)
+    val answer = integer("Answer")
+}
+
+class PollAnswer(id: EntityID<CompositeID>): CompositeEntity(id) {
+    var userId by PollAnswerTable.userId
+        private set
+    var question by PollAnswerTable.question
+        private set
+    private var answerId by PollAnswerTable.answer
+    var answer: Int
+        get() = answerId
+        set(value) = useDb {
+            answerId = value
+        }
+
+    companion object: CompositeEntityClass<PollAnswer>(PollAnswerTable) {
+        @JvmStatic
+        var currentPoll: String? = null
+
+        @JvmStatic
+        fun get(userId: Int) = useDb {
+            find { (PollAnswerTable.userId eq userId) and (PollAnswerTable.question eq currentPoll!!) }.firstOrNull()
+                ?: new {
+                    this.userId = EntityID(userId, SteamwarUserTable)
+                    this.question = currentPoll!!
+                    this.answerId = 0
+                }
+        }
+
+        @JvmStatic
+        fun getCurrentResults(): Map<Int, Int> = useDb {
+            exec("SELECT Count(UserID) AS Times, Answer FROM PollAnswer WHERE Question = ? GROUP BY Answer ORDER BY Times ASC",
+                args = listOf(VarCharColumnType() to currentPoll!!)) {
+                val result = mutableMapOf<Int, Int>()
+                while (it.next()) {
+                    result[it.getInt("Answer")] = it.getInt("Times")
+                }
+                result
+            } ?: emptyMap()
+        }
+    }
+
+    fun hasAnswered() = answerId != 0
+}

CommonCore/SQL/src/de/steamwar/sql/SchemElo.kt

@@ -0,0 +1,74 @@
+/*
+ *   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.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.and
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.core.eq
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+
+object SchemEloTable: CompositeIdTable("SchemElo") {
+    val schemId = reference("SchemId", SchematicNodeTable)
+    val season = integer("Season").entityId()
+    val elo = integer("Elo")
+
+    override val primaryKey = PrimaryKey(schemId, season)
+
+    init {
+        addIdColumn(schemId)
+    }
+}
+
+class SchemElo(id: EntityID<CompositeID>): CompositeEntity(id) {
+    companion object: CompositeEntityClass<SchemElo>(SchemEloTable) {
+        @JvmStatic
+        fun getElo(node: SchematicNode, season: Int, defaultElo: Int = 0) = useDb {
+            find { (SchemEloTable.schemId eq node.id) and (SchemEloTable.season eq season) }.firstOrNull()?.elo ?: defaultElo
+        }
+
+        @JvmStatic
+        fun getCurrentElo(schemId: Int) = getElo(SchematicNode.byId(schemId)!!, Season.getSeason())
+
+        @JvmStatic
+        fun setElo(node: Int, elo: Int) = useDb {
+            findByIdAndUpdate(CompositeID {
+                it[SchemEloTable.schemId] = node
+                it[SchemEloTable.season] = Season.getSeason()
+            }) {
+                it.elo = elo
+            } ?: SchemEloTable.insertIgnore {
+                it[SchemEloTable.schemId] = node
+                it[SchemEloTable.season] = Season.getSeason()
+                it[SchemEloTable.elo] = elo
+            }
+
+            return@useDb
+        }
+    }
+
+    var node by SchemEloTable.schemId
+    var season by SchemEloTable.season
+    var elo by SchemEloTable.elo
+}

CommonCore/SQL/src/de/steamwar/sql/SchematicNode.kt

@@ -116,7 +116,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
 
         @JvmStatic
         fun schematicAccessibleForUser(user: SteamwarUser, schematicId: Int?) = fromSql(
-            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE SN.NodeId = ?",
+            "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?",
             listOf(
                 IntegerColumnType() to user.getId(),
                 IntegerColumnType() to user.getId(),
@@ -314,7 +314,7 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
             parentNodeId = value?.let { EntityID(it, SchematicNodeTable) }
         }
     val parentNode: SchematicNode?
-        get() = useDb { parent?.let { findById(it) } }
+        get() = parent?.let { findById(it) }
 
     val optionalParent: Optional<Int> get() = Optional.ofNullable(parent)
     var lastUpdate by SchematicNodeTable.lastUpdate.transform({ it.toInstant() }, { Timestamp.from(it) })
@@ -365,6 +365,8 @@ class SchematicNode(id: EntityID<Int>) : IntEntity(id) {
         }
     }
 
+    fun getElo(season: Int) = SchemElo.getElo(this, season)
+
     override fun delete() = useDb {
         super.delete()
     }

CommonCore/SQL/src/de/steamwar/sql/Season.java

@@ -0,0 +1,61 @@
+/*
+ *   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.sql;
+
+import java.util.Calendar;
+
+public class Season {
+    private Season() {}
+
+    public static int getSeason() {
+        Calendar calendar = Calendar.getInstance();
+        int yearIndex = calendar.get(Calendar.MONTH) / 4;
+        return (calendar.get(Calendar.YEAR) * 3 + yearIndex);
+    }
+
+    public static String getSeasonStart() {
+        Calendar calendar = Calendar.getInstance();
+        int month = calendar.get(Calendar.MONTH);
+        if (month <= 3) {
+            return calendar.get(Calendar.YEAR) + "-1-1";
+        } else if (month <= 7) {
+            return calendar.get(Calendar.YEAR) + "-5-1";
+        } else {
+            return calendar.get(Calendar.YEAR) + "-9-1";
+        }
+    }
+
+    public static String convertSeasonToString(int season){
+        if (season == -1) return "";
+        int yearSeason = season % 3;
+        int year = (season - yearSeason) / 3;
+        return String.format("%d-%d", year, yearSeason + 1);
+    }
+
+    public static int convertSeasonToNumber(String season){
+        if (season.isEmpty()) return -1;
+        String[] split = season.split("-");
+        try {
+            return Integer.parseInt(split[0]) * 3 + Integer.parseInt(split[1]) - 1;
+        } catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+}

CommonCore/SQL/src/de/steamwar/sql/SteamwarUser.kt

@@ -170,7 +170,7 @@ class SteamwarUser(id: EntityID<Int>): IntEntity(id) {
     fun isLeader() = leader
 
     var locale: Locale by SteamwarUserTable.locale
-        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.ENGLISH })
+        .transform({ it.toLanguageTag() }, { it?.let { Locale.forLanguageTag(it) } ?: Locale.getDefault()})
     var manualLocale by SteamwarUserTable.manualLocale
     var bedrock by SteamwarUserTable.bedrock
     private var passwordInternal by SteamwarUserTable.password

CommonCore/SQL/src/de/steamwar/sql/Team.kt

@@ -33,7 +33,7 @@ object TeamTable : IntIdTable("Team", "TeamID") {
     val name = varchar("TeamName", 16)
     val deleted = bool("TeamDeleted").default(false)
     val address = text("Address").nullable()
-    val port = ushort("Port").default(25565u)
+    val port = ushort("Port")
 }
 
 class Team(id: EntityID<Int>) : IntEntity(id) {
@@ -41,10 +41,10 @@ class Team(id: EntityID<Int>) : IntEntity(id) {
         private val teamCache = mutableMapOf<Int, Team>()
 
         @JvmStatic
-        fun clear() = synchronized(teamCache) { teamCache.clear() }
+        fun clear() = teamCache.clear()
 
         @JvmStatic
-        fun byId(id: Int) = synchronized(teamCache) { teamCache.computeIfAbsent(id) { useDb { Team[id] } } }
+        fun byId(id: Int) = teamCache.computeIfAbsent(id) { useDb { Team[id] } }
 
         @JvmStatic
         fun get(name: String) = useDb { find { (TeamTable.name.lowerCase() eq name.lowercase() or (TeamTable.kuerzel.lowerCase() eq name.lowercase())) and not(TeamTable.deleted) }.firstOrNull() }

CommonCore/SQL/src/de/steamwar/sql/UserElo.kt

@@ -0,0 +1,170 @@
+/*
+ *   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.sql
+
+import de.steamwar.sql.internal.useDb
+import org.jetbrains.exposed.v1.core.*
+import org.jetbrains.exposed.v1.core.dao.id.CompositeID
+import org.jetbrains.exposed.v1.core.dao.id.CompositeIdTable
+import org.jetbrains.exposed.v1.core.dao.id.EntityID
+import org.jetbrains.exposed.v1.dao.CompositeEntity
+import org.jetbrains.exposed.v1.dao.CompositeEntityClass
+import org.jetbrains.exposed.v1.jdbc.insertIgnore
+import org.jetbrains.exposed.v1.jdbc.select
+import java.util.concurrent.ConcurrentHashMap
+
+object UserEloTable : CompositeIdTable("UserElo") {
+    val season = integer("Season").entityId()
+    val gameMode = varchar("GameMode", 16).entityId()
+    val userId = reference("UserID", SteamwarUserTable)
+    val elo = integer("Elo")
+
+    override val primaryKey = PrimaryKey(season, gameMode, userId)
+
+    init {
+        addIdColumn(season)
+        addIdColumn(gameMode)
+    }
+}
+
+class UserElo(id: EntityID<CompositeID>) : CompositeEntity(id) {
+    companion object : CompositeEntityClass<UserElo>(UserEloTable) {
+        private const val ELO_DEFAULT = 0
+
+        private val gameModeUserEloCache: MutableMap<String, MutableMap<Int, Int?>> = ConcurrentHashMap()
+        private val emblemCache: MutableMap<Int, String> = ConcurrentHashMap()
+
+        @JvmStatic
+        fun clear() {
+            gameModeUserEloCache.clear()
+            emblemCache.clear()
+        }
+
+        @JvmStatic
+        fun getEloOrDefault(userId: Int, gameMode: String) =
+            getElo(userId, gameMode) ?: ELO_DEFAULT
+
+        @JvmStatic
+        fun getElo(userId: Int, gameMode: String) =
+            gameModeUserEloCache.getOrPut(gameMode) { mutableMapOf() }
+                .getOrPut(userId) { getEloFromDb(userId, gameMode)?.elo }
+
+        private fun getEloFromDb(userId: Int, gameMode: String) = useDb {
+            find { (UserEloTable.userId eq userId) and (UserEloTable.gameMode eq gameMode) and (UserEloTable.season eq Season.getSeason()) }.firstOrNull()
+        }
+
+        @JvmStatic
+        fun getFightsOfSeason(userId: Int, gamemode: String) = useDb {
+            exec(
+                "SELECT COUNT(*) AS Fights FROM FightPlayer INNER JOIN Fight F on FightPlayer.FightID = F.FightID WHERE UserID = ? AND GameMode = ? AND UNIX_TIMESTAMP(StartTime) + Duration >= UNIX_TIMESTAMP(?)",
+                args = listOf(
+                    IntegerColumnType() to userId,
+                    VarCharColumnType() to gamemode,
+                    VarCharColumnType() to Season.getSeasonStart()
+                )
+            ) {
+                return@exec if (it.next()) {
+                    it.getInt("Fights")
+                } else {
+                    0
+                }
+            } ?: 0
+        }
+
+        @JvmStatic
+        fun setElo(userId: Int, gameMode: String, elo: Int) {
+            emblemCache.remove(userId)
+            gameModeUserEloCache.getOrDefault(gameMode, mutableMapOf()).remove(userId)
+            useDb {
+                findByIdAndUpdate(CompositeID {
+                    it[UserEloTable.userId] = userId
+                    it[UserEloTable.gameMode] = gameMode
+                    it[UserEloTable.season] = Season.getSeason()
+                }) {
+                    it.elo = elo
+                } ?: UserEloTable.insertIgnore {
+                    it[UserEloTable.userId] = userId
+                    it[UserEloTable.gameMode] = gameMode
+                    it[UserEloTable.season] = Season.getSeason()
+                    it[UserEloTable.elo] = elo
+                }
+            }
+        }
+
+        @JvmStatic
+        fun getPlacement(elo: Int, gamemode: String) = useDb {
+            UserEloTable.select(UserEloTable.userId.count()).where {
+                (UserEloTable.gameMode eq gamemode) and (UserEloTable.elo greater elo) and (UserEloTable.season eq Season.getSeason())
+            }.firstOrNull()?.get(UserEloTable.userId.count())?.let { it + 1 }?.toInt() ?: -1
+        }
+
+        @JvmStatic
+        fun getEmblem(user: SteamwarUser, rankedModes: List<String>) =
+            emblemCache.getOrPut(user.id.value) {
+                var emblemProgression = -1
+                for (mode in rankedModes) {
+                    if (getFightsOfSeason(user.id.value, mode) == 0) continue
+                    val progression = getProgression(user.id.value, mode)
+                    if (progression > emblemProgression) {
+                        emblemProgression = progression
+                    }
+                }
+                return toEmblem(emblemProgression)
+            }
+
+        @JvmStatic
+        fun getEmblemProgression(gameMode: String, userId: Int): String =
+            when (getProgression(userId, gameMode)) {
+                -1 -> "§8❱❱❱❱ ❂"
+                0 -> "§e❱§8❱❱❱ ❂"
+                1 -> "§e❱❱§8❱❱ ❂"
+                2 -> "§e❱❱❱§8❱ ❂"
+                3 -> "§e❱❱❱❱§8 ❂"
+                4 -> "§8❱❱❱❱ §5❂"
+                else -> throw SecurityException("Progression is not in range")
+            }
+
+
+        @JvmStatic
+        fun getProgression(userId: Int, gameMode: String) = useDb { getElo(userId, gameMode) ?: -1 }.let {
+            when {
+                it < 0 -> -1
+                it < 150 -> 0
+                it < 350 -> 1
+                it < 600 -> 2
+                it < 900 -> 3
+                else -> 4
+            }
+        }
+
+        @JvmStatic
+        fun toEmblem(progression: Int) = when (progression) {
+            -1 -> ""
+            0 -> "§e❱ "
+            1 -> "§e❱❱ "
+            2 -> "§e❱❱❱ "
+            3 -> "§e❱❱❱❱ "
+            4 -> "§5❂ "
+            else -> throw SecurityException("Progression out of range")
+        }
+    }
+
+    var elo by UserEloTable.elo
+}

CommonCore/SQL/src/de/steamwar/sql/UserPerm.kt

@@ -60,7 +60,7 @@ enum class UserPerm {
         @JvmField
         val prefixes = mapOf(
             PREFIX_NONE to emptyPrefix,
-            PREFIX_YOUTUBER to Prefix("§x§8§A§2§B§E§5", "CC"), // 8A2BE5
+            PREFIX_YOUTUBER to Prefix("§7", "YT"),
             PREFIX_GUIDE to Prefix("§x§e§7§6§2§e§d", "Guide"), // E762ED
             PREFIX_SUPPORTER to Prefix("§x§6§0§9§5§F§B", "Sup"), // 6095FB
             PREFIX_MODERATOR to Prefix("§x§F§F§A§2§5§C", "Mod"), // FFA25C

CommonCore/SQL/src/de/steamwar/sql/internal/KotlinDatabase.kt

@@ -23,7 +23,6 @@ import org.intellij.lang.annotations.Language
 import org.jetbrains.exposed.v1.core.ColumnType
 import org.jetbrains.exposed.v1.core.Expression
 import org.jetbrains.exposed.v1.core.ResultRow
-import org.jetbrains.exposed.v1.core.StdOutSqlLogger
 import org.jetbrains.exposed.v1.core.statements.StatementType
 import org.jetbrains.exposed.v1.dao.IntEntity
 import org.jetbrains.exposed.v1.dao.IntEntityClass

FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java

@@ -27,7 +27,9 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.*;
+import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicReader;
 import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -118,12 +120,7 @@ public class WorldeditWrapper14 implements WorldeditWrapper {
 
     @Override
     public Clipboard loadChar(String charName) throws IOException {
-        File file = new File(FightSystem.getPlugin().getDataFolder(), "text/" + charName + ".schem");
+        return new SpongeSchematicReader(new NBTInputStream(new GZIPInputStream(new FileInputStream(new File(FightSystem.getPlugin().getDataFolder(), "text/" + charName + ".schem"))))).read();
-        Clipboard clipboard;
-        try (ClipboardReader reader = Objects.requireNonNull(ClipboardFormats.findByFile(file)).getReader(new FileInputStream(file))) {
-            clipboard = reader.read();
-        }
-        return clipboard;
     }
 
     @Override

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/ReflectionWrapper21.java

@@ -19,27 +19,11 @@
 
 package de.steamwar.fightsystem.utils;
 
-import io.papermc.paper.datacomponent.DataComponentType;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class ReflectionWrapper21 implements ReflectionWrapper {
-    private static final Set<DataComponentType> FORBIDDEN_TYPES = new HashSet<>();
-
-    static {
-        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_NAME);
-        FORBIDDEN_TYPES.add(DataComponentTypes.PROFILE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.UNBREAKABLE);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCK_DATA);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BLOCKS_ATTACKS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.BUNDLE_CONTENTS);
-        FORBIDDEN_TYPES.add(DataComponentTypes.CUSTOM_MODEL_DATA);
-    }
-
     @Override
     public Object explosionHider(Player player, Object packet, PacketHiderFunction packetHiderFunction) {
         return packet;
@@ -47,7 +31,6 @@ public class ReflectionWrapper21 implements ReflectionWrapper {
 
     @Override
     public boolean hasItems(ItemStack stack) {
-        FORBIDDEN_TYPES.forEach(stack::resetData);
+        return stack.getDataTypes().stream().anyMatch(dataComponentType -> dataComponentType != DataComponentTypes.ENCHANTMENTS || dataComponentType != DataComponentTypes.DAMAGE);
-        return false;
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties

@@ -44,6 +44,7 @@ REMOVE_HELP=§8/§eremove §8[§eplayer§8]
 NOT_FIGHTLEADER=§cYou are not the fight leader
 WIN_HELP=§8/§7win §8[§eteam §8or §etie§8]
 
+INFO_RANKED=§7Ranked§8: §e{0}
 INFO_LEADER=§7Leader {0}§8: {1}
 INFO_SCHEMATIC=§7Schematic {0}§8: §e{1} §7from {2}, Rank: {3}
 
@@ -166,6 +167,7 @@ TPS_WARNING=§c{0} §7TPS
 UI_PRE_RUNNING=§7Kits distributed
 UI_RUNNING=§aFight started
 UI_SKIP=§7Skipping to next event
+UI_UNRANKED=§7Unranked match
 UI_PLAYER_JOINS=§a§l» {0}{1}
 UI_PLAYER_LEAVES=§c§l« {0}{1}
 UI_LEADER_JOINS=§a§l» {0}Leader {1}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties

@@ -154,6 +154,7 @@ COMMAND_CURRENTLY_UNAVAILABLE=§cDieser Befehl ist zu diesem Kampfzeitpunkt nich
 UI_PRE_RUNNING=§7Kits verteilt
 UI_RUNNING=§aArena freigegeben
 UI_SKIP=§7Sprung zum nächsten Ereignis
+UI_UNRANKED=§7Ungewerteter Kampf
 UI_LEADER_JOINS=§a§l» {0}Leader {1}
 UI_PLAYER_DEATH={0}{1} §7ist gestorben
 UI_PLAYER_LEAVE={0}{1} §7hat den Kampf verlassen

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/DummyAI.java

@@ -37,6 +37,7 @@ public class DummyAI extends AI {
     public DummyAI(FightTeam team) {
         super(team, SteamwarUser.get("public"));
 
+        FightStatistics.unrank();
         getEntity().setInvulnerable(true);
     }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java

@@ -182,7 +182,7 @@ public class GUI {
                     }
                     Kit prototype = Kit.getAvailableKits(Fight.getFightPlayer(p).isLeader()).get(0);
                     PersonalKit kit = PersonalKit.create(user.getId(), Config.GameModeConfig.Schematic.Type.toDB(), s, prototype.getInventory(), prototype.getArmor());
-                    Bukkit.getScheduler().runTask(FightSystem.getPlugin(), () -> PersonalKitCreator.openKitCreator(p, kit));
+                    PersonalKitCreator.openKitCreator(p, kit);
                 });
                 anvilInv.open();
             });

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java

@@ -51,6 +51,7 @@ public class InfoCommand implements CommandExecutor {
         if(!SteamwarUser.get(player.getUniqueId()).hasPerm(UserPerm.CHECK))
             return false;
 
+        FightSystem.getMessage().send("INFO_RANKED", player, !FightStatistics.isUnranked());
         for(FightTeam team : Fight.teams()) {
             if(!team.isLeaderless())
                 FightSystem.getMessage().send("INFO_LEADER", player, team.getColoredName(), team.getLeader().getEntity().getName());

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/UnrankCommand.java

@@ -0,0 +1,51 @@
+/*
+ *   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.fightsystem.commands;
+
+import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependentCommand;
+import de.steamwar.fightsystem.utils.FightStatistics;
+import de.steamwar.linkage.Linked;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@Linked
+public class UnrankCommand implements CommandExecutor {
+
+    public UnrankCommand () {
+        new StateDependentCommand(ArenaMode.VariableTeams, FightState.Setup, "unrank", this);
+    }
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if(!(sender instanceof Player))
+            return false;
+        Player player = (Player) sender;
+
+        if(Commands.checkGetLeader(player) == null)
+            return false;
+
+        FightStatistics.unrank();
+        return false;
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/event/TNTDistributor.java

@@ -32,10 +32,10 @@ public class TNTDistributor {
 
     public TNTDistributor() {
         new StateDependentTask(Winconditions.TNT_DISTRIBUTION, FightState.Running, () -> Fight.teams().forEach(team -> team.getPlayers().forEach(fp -> {
-            if (!fp.isLiving())
+            if(!fp.isLiving())
                 return;
 
-            fp.ifPlayer(player -> player.getInventory().addItem(new ItemStack(Material.TNT, 1)));
+            fp.ifPlayer(player -> player.getInventory().addItem(new ItemStack(Material.TNT, 20)));
-        })), 20, 20);
+        })), 300, 300);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -203,23 +203,13 @@ public class FightSchematic extends StateDependent {
         for(int i = 0; i < chars.length; i++){
             Clipboard character;
             try {
-                if (Character.isLowerCase(chars[i])) {
+                character = WorldeditWrapper.impl.loadChar(chars[i] == '/' ? "slash" : String.valueOf(chars[i]));
-                    character = WorldeditWrapper.impl.loadChar("lower/" + chars[i]);
-                } else if (Character.isUpperCase(chars[i])) {
-                    character = WorldeditWrapper.impl.loadChar("upper/" + chars[i]);
-                } else {
-                    character = WorldeditWrapper.impl.loadChar(chars[i] == '/' ? "slash" : String.valueOf(chars[i]));
-                }
             } catch (IOException e) {
+                Bukkit.getLogger().log(Level.WARNING, "Could not display character {} due to missing file!", chars[i]);
                 try {
-                    character = WorldeditWrapper.impl.loadChar(chars[i] == '/' ? "slash" : String.valueOf(chars[i]));
+                    character = WorldeditWrapper.impl.loadChar("");
-                } catch (IOException ex) {
+                }catch (IOException ex) {
-                    Bukkit.getLogger().log(Level.WARNING, "Could not display character {} due to missing file!", chars[i]);
+                    throw new SecurityException("Could not load text", ex);
-                    try {
-                        character = WorldeditWrapper.impl.loadChar("");
-                    }catch (IOException exc) {
-                        throw new SecurityException("Could not load text", exc);
-                    }
                 }
             }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -393,6 +393,7 @@ public class FightTeam {
 
     public void pasteSchem(SchematicNode schematic){
         if(schematic.getSchemtype().check()) {
+            FightStatistics.unrank();
             FightSystem.getMessage().broadcast("SCHEMATIC_UNCHECKED", getColoredName());
         }
 

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKitListener.java

@@ -34,7 +34,6 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
-import org.bukkit.inventory.PlayerInventory;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -63,7 +62,6 @@ public class HotbarKitListener implements Listener {
     public void onInventoryClick(InventoryClickEvent event) {
         int slot = event.getSlot();
         if (slot < 0 || slot >= HotbarKit.HOTBAR_SIZE) return;
-        if (!(event.getClickedInventory() instanceof PlayerInventory)) return;
 
         Player player = (Player) event.getWhoClicked();
         click(player, slot, event);

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Kit.java

@@ -117,7 +117,7 @@ public class Kit {
         if(kit.isList("Armor"))
             armor = Objects.requireNonNull(kit.getList("Armor")).toArray(new ItemStack[0]);
         else
-            armor = new ItemStack[]{ null, null, null, null};
+            armor = null;
         leaderAllowed = kit.getBoolean("LeaderAllowed");
         memberAllowed = kit.getBoolean("MemberAllowed");
         if(kit.isList("Effects"))
@@ -261,7 +261,7 @@ public class Kit {
         player.getInventory().setContents(inventory);
         if(armor != null)
             player.getInventory().setArmorContents(armor);
-        player.updateInventory(); //TODO issue in 1.21.6?
+        player.updateInventory();
         if(effects != null)
             player.addPotionEffects(effects);
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java

@@ -35,7 +35,6 @@ import org.bukkit.GameMode;
 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;
@@ -181,7 +180,6 @@ public class Permanent implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onExplosion(EntityExplodeEvent e) {
-        if (!(e.getEntity() instanceof TNTPrimed)) return;
         e.blockList().removeIf(block -> {
             if(block.getType() == Material.TNT) {
                 return false;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java

@@ -32,16 +32,20 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.OneShotStateDependent;
 import de.steamwar.fightsystem.winconditions.Wincondition;
 import de.steamwar.linkage.Linked;
+import de.steamwar.network.NetworkSender;
+import de.steamwar.network.packets.common.FightEndsPacket;
 import de.steamwar.sql.EventFight;
 import de.steamwar.sql.EventRelation;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 
 import java.nio.file.Files;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 import static de.steamwar.sql.Fight.create;
 import static de.steamwar.sql.Fight.markReplayAvailable;
@@ -49,6 +53,14 @@ import static de.steamwar.sql.Fight.markReplayAvailable;
 @Linked
 public class FightStatistics {
 
+    @Getter
+    private static boolean unranked = false;
+
+    public static void unrank() {
+        unranked = true;
+        FightUI.addSubtitle("UI_UNRANKED");
+    }
+
     private Timestamp starttime = Timestamp.from(Instant.now());
 
     public FightStatistics() {
@@ -133,6 +145,12 @@ public class FightStatistics {
         } catch (Exception e) {
             Bukkit.getLogger().log(Level.SEVERE, "Failed to save statistics", e);
         }
+
+        if (!Bukkit.getOnlinePlayers().isEmpty() && !unranked) {
+            NetworkSender.send(new FightEndsPacket((byte) win, blueSchem == null ? 0 : blueSchem, redSchem == null ? 0 : redSchem, Fight.getBlueTeam().getPlayers().stream().map(FightPlayer::getUser).map(SteamwarUser::getId).collect(Collectors.toList()), Fight.getRedTeam().getPlayers().stream().map(FightPlayer::getUser).map(SteamwarUser::getId).collect(Collectors.toList()), gameMode, (int)(endTime.getEpochSecond() - starttime.toInstant().getEpochSecond())));
+        }
+
+        unranked = false;
     }
 
     private int getLeader(FightTeam team) {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java

@@ -91,7 +91,7 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr
         @EventHandler
         public void onEntityExplode(EntityExplodeEvent event) {
             if (
-                    event.getEntityType() != EntityType.PRIMED_TNT ||
+                    event.getEntityType() == EntityType.FIREBALL ||
                     !team.getExtendRegion().inRegion(event.getEntity().getLocation()) ||
                     (!Config.GameModeConfig.WinConditionParams.PercentEntern && !Config.GameModeConfig.EnterStages.isEmpty() && Config.GameModeConfig.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
             ) {

FightSystem/build.gradle.kts

@@ -50,18 +50,6 @@ tasks.register<FightServer>("WarGear20") {
     config = "WarGear20.yml"
 }
 
-tasks.register<FightServer>("HalloweenWS") {
-    group = "run"
-    description = "Run a Halloween 1.21 Fight Replay Server"
-    dependsOn(":SpigotCore:shadowJar")
-    dependsOn(":FightSystem:shadowJar")
-    template = "HalloweenWS"
-    worldName = "arenas/Lucifus"
-    config = "HalloweenWS.yml"
-    replay = 179786
-    jar = "/jars/paper-1.21.6.jar"
-}
-
 tasks.register<FightServer>("WarGear21") {
     group = "run"
     description = "Run a WarGear 1.21 Fight Server"
@@ -82,13 +70,3 @@ tasks.register<FightServer>("SpaceCraftDev20") {
     worldName = "arenas/AS_Horizon"
     config = "SpaceCraftDev20.yml"
 }
-
-tasks.register<FightServer>("QuickGear20") {
-    group = "run"
-    description = "Run a QuickGear 1.20 Fight Server"
-    dependsOn(":SpigotCore:shadowJar")
-    dependsOn(":FightSystem:shadowJar")
-    template = "QuickGear20"
-    worldName = "arenas/WarGearPark"
-    config = "QuickGear20.yml"
-}

LobbySystem/src/de/steamwar/lobby/boatrace/BoatRace.java

@@ -22,9 +22,8 @@ package de.steamwar.lobby.boatrace;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.lobby.LobbySystem;
-import de.steamwar.lobby.util.LeaderboardManager;
+import de.steamwar.lobby.util.Leaderboard;
-import de.steamwar.sql.Leaderboard;
+import de.steamwar.sql.UserConfig;
-import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Sound;
@@ -44,18 +43,16 @@ import org.bukkit.scheduler.BukkitTask;
 
 import java.util.EventListener;
 
-import static de.steamwar.lobby.util.LeaderboardManager.renderTime;
+import static de.steamwar.lobby.util.Leaderboard.renderTime;
 
 public class BoatRace implements EventListener, Listener {
 
-    private static final String CONFIG_KEY = "lobby@boatrace";
-
     private static final double MIN_HEIGHT = 4.3;
 
     public static final REntityServer boatNpcServer;
 
     private static boolean oneNotStarted = false;
-    private static final LeaderboardManager leaderboard;
+    private static final Leaderboard leaderboard;
 
     static {
         boatNpcServer = new REntityServer();
@@ -68,7 +65,7 @@ public class BoatRace implements EventListener, Listener {
                 new BoatRace(player);
             }
         });
-        leaderboard = new LeaderboardManager(boatNpcServer, CONFIG_KEY, BoatRacePositions.LEADERBOARD);
+        leaderboard = new Leaderboard(boatNpcServer, "lobby@boatrace", BoatRacePositions.LEADERBOARD, 5);
     }
 
     private final Player player;
@@ -126,11 +123,12 @@ public class BoatRace implements EventListener, Listener {
                 HandlerList.unregisterAll(this);
                 task.cancel();
                 LobbySystem.getMessage().send("BOAT_RACE_TIME", player, renderTime(time));
-                SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+                String conf = UserConfig.getConfig(player.getUniqueId(), "lobby@boatrace");
-                long best = leaderboard.getPlayerTime(user);
+                long best = Long.parseLong(conf == null ? String.valueOf(Long.MAX_VALUE) : conf);
                 if (time < best) {
                     LobbySystem.getMessage().send("BOAT_RACE_NEW_BEST", player);
-                    leaderboard.updateBestTime(user, time);
+                    UserConfig.updatePlayerConfig(player.getUniqueId(), "lobby@boatrace", String.valueOf(time));
+                    leaderboard.update();
                 }
             } else {
                 player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1);

LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java

@@ -22,8 +22,8 @@ package de.steamwar.lobby.jumpandrun;
 import de.steamwar.linkage.Linked;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.listener.PlayerSpawn;
-import de.steamwar.lobby.util.LeaderboardManager;
+import de.steamwar.lobby.util.Leaderboard;
-import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.UserConfig;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -45,7 +45,7 @@ import java.util.*;
 @Linked
 public class JumpAndRun implements Listener {
 
-    public static final String JUMP_AND_RUN_CONFIG = "jump_and_run@winter25";
+    public static final String JUMP_AND_RUN_CONFIG = "jump_and_run";
 
     private static final String BAR_EMPTY = "||||||||||||||||||||||||||||||";
 
@@ -58,7 +58,7 @@ public class JumpAndRun implements Listener {
     private static final Map<Player, Long> CLICKED = new HashMap<>();
     private static final Map<Player, Integer> CLICKED_COUNT = new HashMap<>();
 
-    private static final LeaderboardManager LEADERBOARD = new LeaderboardManager(LobbySystem.getEntityServer(false), JUMP_AND_RUN_CONFIG, new Location(Bukkit.getWorlds().get(0), 2338.5, 42.5, 1231.5));
+    private static final Leaderboard LEADERBOARD = new Leaderboard(LobbySystem.getEntityServer(false), JUMP_AND_RUN_CONFIG, new Location(Bukkit.getWorlds().get(0), 2338.5, 42.5, 1231.5), 5);
 
     {
         Bukkit.getScheduler().runTaskTimer(LobbySystem.getInstance(), () -> {
@@ -161,14 +161,18 @@ public class JumpAndRun implements Listener {
     }
 
     private void updateJumpAndRunTime(Player player, long time) {
-        long best = LEADERBOARD.getPlayerTime(SteamwarUser.get(player.getUniqueId()));
+        String jumpAndRunTimeConfig = UserConfig.getConfig(player.getUniqueId(), JUMP_AND_RUN_CONFIG);
-        if (time < best) {
+        if (jumpAndRunTimeConfig == null) {
-            if (best != Long.MAX_VALUE) {
+            UserConfig.updatePlayerConfig(player.getUniqueId(), JUMP_AND_RUN_CONFIG, time + "");
+        } else {
+            long jumpAndRunTime = Long.parseLong(jumpAndRunTimeConfig);
+            if (time < jumpAndRunTime) {
                 SimpleDateFormat format = new SimpleDateFormat(LobbySystem.getMessage().parse("JUMP_AND_RUN_TIME", player), Locale.ROOT);
-                String parsed = format.format(new Date(best - time));
+                String parsed = format.format(new Date(jumpAndRunTime - time));
                 LobbySystem.getMessage().sendPrefixless("JUMP_AND_RUN_PERSONAL_BEST", player, parsed);
+                UserConfig.updatePlayerConfig(player.getUniqueId(), JUMP_AND_RUN_CONFIG, time + "");
+                LEADERBOARD.update();
             }
-            LEADERBOARD.updateBestTime(SteamwarUser.get(player.getUniqueId()), time);
         }
     }
 

LobbySystem/src/de/steamwar/lobby/special/advent/Present.java

@@ -97,10 +97,9 @@ public class Present {
                 folder = null;
             }
         }
+        NodeMember nodeMember = NodeMember.createNodeMember(schematicId, user.getId());
         if (folder != null) {
-            NodeMember.createNodeMember(schematicId, user.getId(), folder);
+            nodeMember.setParent(Optional.of(folder.getId()));
-        } else {
-            NodeMember.createNodeMember(schematicId, user.getId());
         }
         LobbySystem.getMessage().send("ADVENT_CALENDAR_OPEN", player, node.getName());
         player.playSound(location, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1);

LobbySystem/src/de/steamwar/lobby/util/Leaderboard.java

@@ -23,8 +23,9 @@ import de.steamwar.entity.RArmorStand;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.lobby.LobbySystem;
-import de.steamwar.sql.Leaderboard;
 import de.steamwar.sql.SteamwarUser;
+import de.steamwar.sql.internal.Statement;
+import lombok.AllArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -38,18 +39,25 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class LeaderboardManager implements Listener {
+public class Leaderboard implements Listener {
+
+    private static final Statement LEADERBOARD = new Statement("SELECT User, CAST(Value as integer) AS Time from UserConfig WHERE Config = ? ORDER BY CAST(Value as integer) ASC LIMIT ?");
+    private static final Statement PLAYER_TIME = new Statement("SELECT CAST(Value as integer) AS Time FROM UserConfig WHERE Config = ? AND User = ?");
+    private static final Statement PLAYER_PLACEMENT = new Statement("SELECT COUNT(*) AS Placement FROM UserConfig WHERE Config = ? AND CAST(Value as integer) < (SELECT CAST(Value as integer) AS Time FROM UserConfig WHERE Config = ? AND User = ?)");
+
     private final REntityServer server;
     private final String configKey;
     private final Location location;
+    private final int best;
     private long bestTime;
     private final List<REntity> entities = new ArrayList<>();
     private final Map<Integer, REntityServer> playerPlacements = new HashMap<>();
 
-    public LeaderboardManager(REntityServer server, String configKey, Location location) {
+    public Leaderboard(REntityServer server, String configKey, Location location, int best) {
         this.server = server;
         this.configKey = configKey;
         this.location = location;
+        this.best = best;
         Bukkit.getPluginManager().registerEvents(this, LobbySystem.getInstance());
         update();
     }
@@ -57,23 +65,20 @@ public class LeaderboardManager implements Listener {
     public void update() {
         entities.forEach(REntity::die);
         entities.clear();
-        List<Leaderboard> leaderboard = getLeaderboard();
+        List<LeaderboardEntry> leaderboard = getLeaderboard();
-        if (leaderboard.isEmpty()) {
+        if (leaderboard.isEmpty()) return;
-            bestTime = Long.MAX_VALUE;
+        bestTime = leaderboard.get(0).time;
-            return;
-        }
-        bestTime = leaderboard.get(0).getTime();
         for (int i = 0; i < leaderboard.size(); i++) {
-            Leaderboard entry = leaderboard.get(i);
+            LeaderboardEntry entry = leaderboard.get(i);
             RArmorStand entity = new RArmorStand(server, location.clone().add(0, (leaderboard.size() - i - 1) * 0.32, 0), RArmorStand.Size.MARKER);
-            SteamwarUser user = SteamwarUser.byId(entry.getUser());
+            SteamwarUser user = SteamwarUser.byId(entry.user);
             String color = "§7";
             if (i == 0) {
                 color = "§6§l";
             } else if (i < 3) {
                 color = "§e";
             }
-            entity.setDisplayName(calcName(user, color, i + 1, entry.getTime()));
+            entity.setDisplayName(calcName(user, color, i + 1, entry.time));
             entity.setInvisible(true);
             entities.add(entity);
         }
@@ -130,27 +135,32 @@ public class LeaderboardManager implements Listener {
         return st.toString();
     }
 
-    private boolean isNewBestTime(long time) {
+    private List<LeaderboardEntry> getLeaderboard() {
-        return time < bestTime;
+        return LEADERBOARD.select(resultSet -> {
+            List<LeaderboardEntry> leaderboard = new ArrayList<>();
+            while (resultSet.next()) {
+                leaderboard.add(new LeaderboardEntry(resultSet.getInt("User"), resultSet.getLong("Time")));
+            }
+            return leaderboard;
+        }, configKey, best);
     }
 
-    public void updateBestTime(SteamwarUser user, long time) {
+    private long getPlayerTime(SteamwarUser user) {
-        Leaderboard.upsert(user.getId(), configKey, time, isNewBestTime(time));
+        return PLAYER_TIME.select(resultSet -> {
-        update();
+            if (!resultSet.next()) {
-    }
+                return Long.MAX_VALUE;
-
+            }
-    private List<Leaderboard> getLeaderboard() {
+            return resultSet.getLong("Time");
-        return Leaderboard.getLeaderboard(configKey);
+        }, configKey, user.getId());
-    }
-
-    public long getPlayerTime(SteamwarUser user) {
-        Leaderboard lb = Leaderboard.getPlayerTime(user, configKey);
-        if(lb != null) return lb.getTime();
-        return Long.MAX_VALUE;
     }
 
     private int getPlayerPlacement(SteamwarUser user) {
-        return Leaderboard.getPlayerPlacement(user, configKey);
+        return PLAYER_PLACEMENT.select(resultSet -> {
+            if (!resultSet.next()) {
+                return Integer.MAX_VALUE;
+            }
+            return resultSet.getInt("Placement");
+        }, configKey, configKey, user.getId());
     }
 
     public static String renderTime(long time) {
@@ -168,6 +178,13 @@ public class LeaderboardManager implements Listener {
                 time % 1000);
     }
 
+    @AllArgsConstructor
+    private class LeaderboardEntry {
+
+        private final int user;
+        private final long time;
+    }
+
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         SteamwarUser steamwarUser = SteamwarUser.get(event.getPlayer().getUniqueId());

SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties

@@ -17,7 +17,7 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-PREFIX=§eSchematic§8»§7
+PREFIX=§eSchematic§8» §7
 ON=§aon
 OFF=§coff
 CHANGE=§7To change
@@ -59,6 +59,7 @@ UTIL_INFO_TYPE_DIR=§eDIR
 UTIL_INFO_RANK=§7Rank: §e{0}
 UTIL_INFO_COLOR=§7Color translation: {0}
 UTIL_INFO_REPLAY=§7Replay playback: {0}
+UTIL_INFO_ELO=§7Elo: §e{0}
 UTIL_INFO_FORMAT=§7Format: §e{0}
 UTIL_INFO_STATUS=§cState: §c{0}: {1}
 UTIL_INFO_MEMBER=§7Members: §e{0}
@@ -104,7 +105,6 @@ UTIL_SUBMIT_COLOR_ON=§aReplace pink to team color
 UTIL_SUBMIT_COLOR_OFF=§cDo not replace pink
 UTIL_SUBMIT_DIRECT=§eSubmit directly
 UTIL_SUBMIT_DIRECT_DONE=§aThe Schematic will be reviewed in a timely manner
-UTIL_SUBMIT_DIRECT_PLAYABLE=§aYou can now use this Schematic in the arena! Good luck and have fun.
 UTIL_SUBMIT_EXTEND=§eExtend Schematic
 UTIL_SUBMIT_EXTEND_DONE=§aThe preparation server is starting
 UTIL_CHECK_TYPE_NOT_FOUND=§cThe type {0} was not found

SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties

@@ -88,7 +88,6 @@ UTIL_SUBMIT_COLOR_ON=§aPink zu Teamfarbe ersetzen
 UTIL_SUBMIT_COLOR_OFF=§cPink nicht ersetzen
 UTIL_SUBMIT_DIRECT=§eDirekt einsenden
 UTIL_SUBMIT_DIRECT_DONE=§aDie Schematic wird zeitnah überprüft
-UTIL_SUBMIT_DIRECT_PLAYABLE=§aDu kannst die Schematic jetzt in der Arena verwenden! Viel Glück und viel Spaß.
 UTIL_SUBMIT_EXTEND=§eSchematic ausfahren
 UTIL_SUBMIT_EXTEND_DONE=§aDer Vorbereitungsserver wird gestartet
 UTIL_INFO_ACTION_REVISIONS_HOVER=§eVersionen anzeigen

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java

@@ -248,6 +248,7 @@ public class SchematicCommandUtils {
             if (node.getSchemtype().fightType()) {
                 SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_COLOR", player, SchematicSystem.MESSAGE.parse(node.replaceColor() ? "ON" : "OFF", player));
                 SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_REPLAY", player, SchematicSystem.MESSAGE.parse(node.allowReplay() ? "ON" : "OFF", player));
+                SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_ELO", player, node.getElo(Season.getSeason()));
             }
 
             SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_FORMAT", player, node.getFileEnding());
@@ -481,7 +482,7 @@ public class SchematicCommandUtils {
                 SchematicSystem.MESSAGE.send("UTIL_TYPE_EXTEND", player);
             } else {
                 node.setSchemtype(type.checkType());
-                SchematicSystem.MESSAGE.send(type.getManualCheck() ? "UTIL_SUBMIT_DIRECT_DONE" : "UTIL_SUBMIT_DIRECT_PLAYABLE", player);
+                SchematicSystem.MESSAGE.send("UTIL_SUBMIT_DIRECT_DONE", player);
             }
         }
     }
@@ -498,7 +499,7 @@ public class SchematicCommandUtils {
         });
         inv.setItem(7, SWItem.getDye(7), (byte) 7, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_DIRECT", player), click -> {
             node.setSchemtype(type.checkType());
-            SchematicSystem.MESSAGE.send(type.getManualCheck() ? "UTIL_SUBMIT_DIRECT_DONE" : "UTIL_SUBMIT_DIRECT_PLAYABLE", player);
+            SchematicSystem.MESSAGE.send("UTIL_SUBMIT_DIRECT_DONE", player);
             player.closeInventory();
         });
         inv.setItem(8, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("UTIL_SUBMIT_EXTEND", player), click -> {