Simplify NoClipCommand

Reviewed-on: SteamWar/SteamWar#489
Reviewed-by: YoyoNow <4+yoyonow@noreply.localhost>

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

@@ -131,6 +131,7 @@ public class BauScoreboard implements Listener {
 
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
+        SWScoreboard.impl.removeScoreboard(event.getPlayer());
         ADDITIONAL_SCOREBOARD_LINES.remove(event.getPlayer());
     }
 }

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

@@ -325,7 +325,7 @@ public class FixedRegion implements Region {
         }
 
         floorLevel = prototype.getFloorOffset() != 0 ? minPoint.getY() + prototype.getFloorOffset() : 0;
-        waterLevel = prototype.getWaterOffset() != 0 ? minPoint.getX() + prototype.getWaterOffset() : 0;
+        waterLevel = prototype.getWaterOffset() != 0 ? minPoint.getY() + prototype.getWaterOffset() : 0;
 
         File found = null;
         File baseFile = new File(BauSystem.getInstance().getDataFolder().getParentFile(), "FightSystem");

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

@@ -307,12 +307,12 @@ class SteamwarUser(id: EntityID<Int>) : IntEntity(id) {
             punishments[punishment] = Punishment.createPunishment(this@SteamwarUser.id.value, from, punishment, reason, time, perma)
         }
 
-    fun setLocale(locale: Locale?, manualeLocale: Boolean) {
+    fun setLocale(locale: Locale?, manualLocale: Boolean) {
         if (locale == null || (this.manualLocale && !manualLocale)) return
 
         useDb {
             this@SteamwarUser.locale = locale
-            this@SteamwarUser.manualLocale = manualeLocale
+            this@SteamwarUser.manualLocale = manualLocale
         }
     }
 

SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java

@@ -1,82 +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.core.events;
-
-import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.core.Core;
-import de.steamwar.linkage.Linked;
-import de.steamwar.sql.SWException;
-import de.steamwar.techhider.ProtocolUtils;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
-import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Linked
-public class AntiNocom implements Listener {
-
-    private final Map<Player, Integer> flags = new ConcurrentHashMap<>();
-
-    public AntiNocom() {
-        TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, this::onDig);
-        registerUseItem();
-    }
-
-    @EventHandler
-    public void onQuit(PlayerQuitEvent e) {
-        flags.remove(e.getPlayer());
-    }
-
-    private void registerUseItem() {
-        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, (player, packet) -> {
-            BlockPos pos = packet.getHitResult().getBlockPos();
-            return isValid(player, "UseItem", pos.getX(), pos.getZ()) ? packet : null;
-        });
-    }
-
-    private ServerboundPlayerActionPacket onDig(Player player, ServerboundPlayerActionPacket packet) {
-        BlockPos pos = packet.getPos();
-        return isValid(player, "Dig", pos.getX(), pos.getZ()) ? packet : null;
-    }
-
-    private boolean isValid(Player player, String type, int x, int z) {
-        if ((x == 0 && z == 0) || player.getWorld().isChunkLoaded(ProtocolUtils.posToChunk(x), ProtocolUtils.posToChunk(z))) {
-            return true;
-        }
-
-        int amount = flags.compute(player, (p, a) -> a == null ? 1 : a + 1);
-        if (amount % 8 == 0) {  // Only after 8 and every 8 to reduce false flags and spam
-            if (amount == 8) {
-                // Schedule player kick only once
-                Bukkit.getScheduler().runTask(Core.getInstance(), () -> player.kickPlayer(null));
-            }
-
-            SWException.log(player.getName() + " kicked for potential NoCom-DOS attack", x + " " + z + " " + type + " " + amount);
-        }
-        return false;
-    }
-}

SpigotCore/SpigotCore_Main/src/de/steamwar/core/worldedit/SteamEditWand.java

@@ -30,16 +30,13 @@ import com.sk89q.worldedit.regions.selector.limit.PermissiveSelectorLimits;
 import com.sk89q.worldedit.world.World;
 import de.steamwar.core.Core;
 import de.steamwar.core.SWPlayer;
-import de.steamwar.entity.CWireframe;
-import de.steamwar.entity.REntityServer;
 import de.steamwar.inventory.SWItem;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
-import org.bukkit.Bukkit;
-import org.bukkit.FluidCollisionMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.*;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -47,6 +44,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.RayTraceResult;
 
@@ -65,6 +63,16 @@ public class SteamEditWand implements Listener {
     };
     public static final ItemStack ITEM = new SWItem(MATERIAL, NAME).setLore(LORE).getItemStack();
 
+    static {
+        ItemMeta itemMeta = ITEM.getItemMeta();
+        itemMeta.addAttributeModifier(Attribute.BLOCK_INTERACTION_RANGE, new AttributeModifier(
+                NamespacedKey.fromString("range", Core.getInstance()),
+                35.0,
+                AttributeModifier.Operation.ADD_NUMBER
+        ));
+        ITEM.setItemMeta(itemMeta);
+    }
+
     private boolean noWand(Player player) {
         return player.getInventory().getItemInMainHand().getType() != SteamEditWand.MATERIAL;
     }
@@ -87,15 +95,6 @@ public class SteamEditWand implements Listener {
         TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, this::rightClick);
         TinyProtocol.instance.addFilter(ServerboundPickItemFromBlockPacket.class, this::middleClick);
         TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, this::swapHands);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, this::movePlayerPacket);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, this::movePlayerPacket);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, this::movePlayerPacket);
-
-        Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> {
-            for (Player player : Bukkit.getOnlinePlayers()) {
-                if (noWand(player)) SWPlayer.of(player).removeComponent(SWEditCursor.class);
-            }
-        }, 1, 1);
     }
 
     @EventHandler
@@ -104,29 +103,6 @@ public class SteamEditWand implements Listener {
         event.setCancelled(true);
     }
 
-    public static class SWEditCursor implements SWPlayer.Component {
-        private Player player;
-        private REntityServer entityServer = new REntityServer();
-        private CWireframe wireframe;
-
-        @Override
-        public void onMount(SWPlayer player) {
-            this.player = player.getPlayer();
-            entityServer.addPlayer(player.getPlayer());
-            wireframe = new CWireframe(entityServer);
-        }
-
-        @Override
-        public void onUnmount(SWPlayer player) {
-            entityServer.close();
-        }
-
-        public void setLocation(Location location) {
-            wireframe.setPos1And2(location, location);
-            wireframe.setBlock(WorldEditRendererCUIEditor.Type.CURSOR.getMaterial(player).createBlockData());
-        }
-    }
-
     private Packet<?> leftClick(Player player, Packet<?> packet) {
         if (noWand(player)) return packet;
         if (player.getOpenInventory().getType() != InventoryType.CREATIVE) return packet;
@@ -380,30 +356,4 @@ public class SteamEditWand implements Listener {
         });
         return null;
     }
-
-    public ServerboundMovePlayerPacket movePlayerPacket(Player player, ServerboundMovePlayerPacket packet) {
-        SWPlayer swPlayer = SWPlayer.of(player);
-
-        if (noWand(player)) {
-            swPlayer.removeComponent(SWEditCursor.class);
-            return packet;
-        }
-
-        double distance = WorldEditRendererCUIEditor.Type.CURSOR.getWidth(player).blocks;
-        RayTraceResult result = player.rayTraceBlocks(distance, FluidCollisionMode.NEVER);
-        Block block = result == null ? null : result.getHitBlock();
-        if (result == null || block == null) {
-            swPlayer.removeComponent(SWEditCursor.class);
-            return packet;
-        }
-
-        if (!swPlayer.hasComponent(SWEditCursor.class)) {
-            swPlayer.setComponent(new SWEditCursor());
-        }
-
-        swPlayer.getComponent(SWEditCursor.class).ifPresent(cursor -> {
-            cursor.setLocation(block.getLocation());
-        });
-        return packet;
-    }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/cursor/CursorListener.java

@@ -1,20 +1,14 @@
 package de.steamwar.cursor;
 
-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.core.Core;
 import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
 import lombok.Getter;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 
-import java.util.Optional;
-
 
 @Linked
 public class CursorListener implements Listener {
@@ -26,10 +20,6 @@ public class CursorListener implements Listener {
             instance = this;
         }
 
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, this::updateCursorFromPacket);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Rot.class, this::updateCursorFromPacket);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, this::updateCursorFromPacket);
-
         Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> {
             SWPlayer.allWithSingleComponent(Cursor.class)
                     .map(SWPlayer.SWPlayerWithComponent::getComponent)
@@ -37,15 +27,6 @@ public class CursorListener implements Listener {
         }, 1, 1);
     }
 
-    public Packet<?> updateCursorFromPacket(Player player, Packet<?> packet) {
-        SWPlayer swPlayer = SWPlayer.of(player);
-        Optional<Cursor> activeCursor = swPlayer.getComponent(Cursor.class);
-
-        activeCursor.ifPresent(Cursor::renderDeduplicated);
-
-        return packet;
-    }
-
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         SWPlayer.of(event.getPlayer()).getComponent(Cursor.class).ifPresent(cursor -> {

SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java

@@ -67,7 +67,9 @@ public class SWScoreboard {
     }
 
     public void removeScoreboard(Player player) {
-        player.getScoreboard().getObjective(SIDEBAR).unregister();
+        if (player.getScoreboard().getObjective(SIDEBAR) != null) {
+            player.getScoreboard().getObjective(SIDEBAR).unregister();
+        }
         playerBoards.remove(player);
     }
 }