Merge branch 'main' into exposed

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

@@ -46,6 +46,7 @@ import de.steamwar.linkage.SpigotLinker;
 import de.steamwar.message.Message;
 import lombok.Getter;
 import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -128,6 +129,8 @@ public class BauSystem extends JavaPlugin implements Listener {
         TraceRecorder.instance.init();
 
         new WorldEditRendererCUIEditor();
+
+        Bukkit.getWorlds().get(0).setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false);
     }
 
     @EventHandler

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

@@ -87,6 +87,7 @@ public class MaterialLazyInit {
                 Block block = Bukkit.getWorlds().get(0).getBlockAt(0, 0, 0);
                 block.setType(material);
                 unmoveable = block.getPistonMoveReaction() == PistonMoveReaction.BLOCK || block.getPistonMoveReaction() == PistonMoveReaction.IGNORE || block.getState() instanceof TileState;
+                block.setType(Material.AIR);
             }
 
             if (material.isItem() && material != Material.AIR) {

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

@@ -23,15 +23,40 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
+import de.steamwar.core.CRIUWakeupEvent;
+import de.steamwar.data.BauLockState;
 import de.steamwar.linkage.Linked;
+import de.steamwar.network.packets.PacketHandler;
+import de.steamwar.network.packets.server.BaulockUpdatePacket;
 import de.steamwar.sql.UserConfig;
+import lombok.Getter;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 
 @Linked
-public class BauLockStateScoreboard implements ScoreboardElement {
+public class BauLockStateScoreboard extends PacketHandler implements ScoreboardElement, Listener {
 
     private static final String BAU_LOCK_CONFIG_NAME = "baulockstate";
 
+    @Getter
+    private BauLockState lockState = loadLockState();
+
+    private BauLockState loadLockState() {
+        String state = UserConfig.getConfig(BauServer.getInstance().getOwner(), BAU_LOCK_CONFIG_NAME);
+        return state == null ? BauLockState.OPEN : BauLockState.valueOf(state);
+    }
+
+    @Handler
+    public void handleBaulockUpdatePacket(BaulockUpdatePacket packet) {
+        lockState = loadLockState();
+    }
+
+    @EventHandler
+    public void onCRIUWakeup(CRIUWakeupEvent event) {
+        lockState = loadLockState();
+    }
+
     @Override
     public ScoreboardGroup getGroup() {
         return ScoreboardGroup.FOOTER;
@@ -47,23 +72,11 @@ public class BauLockStateScoreboard implements ScoreboardElement {
         if (!BauServer.getInstance().getOwner().equals(p.getUniqueId())) {
             return null;
         }
-        String state = UserConfig.getConfig(p.getUniqueId(), BAU_LOCK_CONFIG_NAME);
-        switch (state == null ? BauLockState.OPEN : BauLockState.valueOf(state)) {
+        switch (lockState) {
             case OPEN:
                 return null;
             default:
-                return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_LOCK_" + state.toUpperCase(), p);
+                return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_LOCK_" + lockState.name(), p);
         }
     }
-
-    public enum BauLockState {
-
-        NOBODY,
-        SUPERVISOR,
-        SERVERTEAM,
-        TEAM_AND_SERVERTEAM,
-        TEAM,
-        OPEN
-    }
-
 }

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

@@ -84,7 +84,12 @@ public class FixedFlagStorage implements FlagStorage {
 
     @Override
     public void clear() {
-        flagMap.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

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

@@ -91,7 +91,12 @@ public class FixedGlobalFlagStorage implements FlagStorage {
 
     @Override
     public void clear() {
-        flagMap.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