Simplify NoClipCommand

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

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

@@ -46,7 +46,7 @@ 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.getSwPlayer().getPlayer().getGameMode() != GameMode.SPECTATOR) return;
                 pair.getComponent().show();
             });
         }, 15L, 15L);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java

@@ -19,12 +19,10 @@
 
 package de.steamwar.bausystem.features.smartplace;
 
-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.linkage.Linked;
-import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -34,104 +32,98 @@ import org.bukkit.block.data.*;
 import org.bukkit.block.data.type.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.RayTraceResult;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Linked
 public class SmartPlaceListener implements Listener {
 
-    private static final Set<Material> CONTAINERS = new HashSet<>();
-    private static final Set<Material> IGNORED = new HashSet<>();
+    private static final Set<Material> IGNORED = Set.of(Material.TNT, Material.REDSTONE_ORE, Material.BEEHIVE, Material.SEA_PICKLE);
 
-    static {
-        World world = Bukkit.getWorlds().get(0);
-        Block block = world.getBlockAt(0, 0, 0);
-        block.setType(Material.AIR);
-        BlockState state = block.getState();
-        for (Material material : Material.values()) {
-            if (material.isLegacy()) continue;
-            if (!material.isInteractable() && !material.isBlock()) continue;
-            BlockData blockData = material.createBlockData();
-            block.setBlockData(blockData);
-            if (block.getState() instanceof TileState) {
-                CONTAINERS.add(material);
-            } else if (blockData instanceof Stairs) {
-                CONTAINERS.add(material);
-            }
-            state.update(true, false);
-        }
-        CONTAINERS.add(Material.GRINDSTONE);
-        CONTAINERS.remove(Material.COMPARATOR);
-        state.update(true, false);
+    private static final Set<UUID> FAKED_SNEAK = new HashSet<>();
 
-        IGNORED.add(Material.TNT);
-        IGNORED.add(Material.REDSTONE_ORE);
-        IGNORED.add(Material.BEEHIVE);
-        IGNORED.add(Material.SEA_PICKLE);
-        IGNORED.remove(Material.STONE);
-        IGNORED.remove(Material.BARRIER);
+    private static boolean isContainer(Block block) {
+        if (block.getType() == Material.COMPARATOR) return false;
+        if (block.getType() == Material.GRINDSTONE) return true;
+        return block.getState() instanceof TileState || block.getBlockData() instanceof Stairs;
     }
 
-    private static final Set<Player> SMART_PLACING = new HashSet<>();
-    private static final Set<Player> WAS_EXECUTED = new HashSet<>();
+    private static boolean isReallySneaking(Player player) {
+        return player.isSneaking() && !FAKED_SNEAK.contains(player.getUniqueId());
+    }
 
-    public SmartPlaceListener() {
-        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, (player, packet) -> {
-            if (!Permission.BUILD.hasPermission(player)) return packet;
-            if (!Config.getInstance().get(player).getPlainValueOrDefault("smartPlace", false)) return packet;
-            RayTraceResult rayTraceResult = player.rayTraceBlocks(6);
-            Block block = rayTraceResult != null ? rayTraceResult.getHitBlock() : null;
-            BlockFace blockFace = rayTraceResult != null ? rayTraceResult.getHitBlockFace() : null;
-            boolean shouldSneak = false;
-            if (block != null) {
-                ItemStack itemStack = player.getInventory().getItemInMainHand();
-                if (block.getType().isInteractable() || block.getType() == Material.NOTE_BLOCK) {
-                    shouldSneak = true;
-                }
-                if (CONTAINERS.contains(block.getType())) {
-                    if (itemStack.getType() == Material.TNT) {
-                        if (block.getType() == Material.CHEST || block.getType() == Material.BARREL || block.getType().name().endsWith("SHULKER_BOX")) {
-                            shouldSneak = false;
-                        }
-                    }
-                } else {
-                    shouldSneak = false;
-                }
-                if (IGNORED.contains(block.getType())) {
-                    shouldSneak = false;
-                }
-                if (blockFace == BlockFace.DOWN && (block.getType() == Material.REPEATER || block.getType() == Material.COMPARATOR) && itemStack.getType().isSolid()) {
-                    shouldSneak = true;
+    private static boolean shouldSmartPlace(Block block, BlockFace blockFace, Material heldType) {
+        boolean smartPlace = false;
+        if (block.getType().isInteractable() || block.getType() == Material.NOTE_BLOCK) {
+            smartPlace = true;
+        }
+        if (isContainer(block)) {
+            if (heldType == Material.TNT) {
+                if (block.getType() == Material.CHEST || block.getType() == Material.BARREL || block.getType().name().endsWith("SHULKER_BOX")) {
+                    smartPlace = false;
                 }
             }
-            boolean sneaking = player.isSneaking();
-            if (sneaking) SMART_PLACING.add(player);
-            player.setSneaking(shouldSneak || sneaking);
-            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-                SMART_PLACING.remove(player);
-                player.setSneaking(sneaking);
-            }, 0);
-            return packet;
+        } else {
+            smartPlace = false;
+        }
+        if (IGNORED.contains(block.getType())) {
+            smartPlace = false;
+        }
+        if (blockFace == BlockFace.DOWN && (block.getType() == Material.REPEATER || block.getType() == Material.COMPARATOR) && heldType.isSolid()) {
+            smartPlace = true;
+        }
+        return smartPlace;
+    }
+
+    private static boolean smartPlaceEnabled(Player player) {
+        return Config.getInstance().get(player).getPlainValueOrDefault("smartPlace", false);
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onSmartPlace(PlayerInteractEvent event) {
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
+        Player player = event.getPlayer();
+        if (player.getGameMode() == GameMode.SPECTATOR) return;
+        if (!Permission.BUILD.hasPermission(player)) return;
+        if (!smartPlaceEnabled(player)) return;
+        if (player.isSneaking()) return;
+
+        ItemStack itemStack = event.getItem();
+        if (itemStack == null || itemStack.getType().isAir()) return;
+        if (!shouldSmartPlace(event.getClickedBlock(), event.getBlockFace(), itemStack.getType())) return;
+
+        player.setSneaking(true);
+        FAKED_SNEAK.add(player.getUniqueId());
+        Bukkit.getScheduler().runTask(BauSystem.getInstance(), () -> {
+            if (FAKED_SNEAK.remove(player.getUniqueId())) {
+                player.setSneaking(false);
+            }
         });
     }
 
+    @EventHandler
+    public void onQuit(PlayerQuitEvent event) {
+        FAKED_SNEAK.remove(event.getPlayer().getUniqueId());
+    }
+
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
-        WAS_EXECUTED.add(event.getPlayer());
+        if (!smartPlaceEnabled(event.getPlayer())) return;
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
         if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) return;
-        if (!event.getPlayer().isSneaking()) return;
+        if (!isReallySneaking(event.getPlayer())) return;
         if (event.getClickedBlock().getType() != Material.REPEATER) return;
         if ((event.getItem() == null || event.getItem().getType() == Material.REPEATER)) {
             Repeater repeater = (Repeater) event.getClickedBlock().getBlockData();
@@ -146,9 +138,9 @@ public class SmartPlaceListener implements Listener {
     @EventHandler
     public void onBlockPlace(BlockPlaceEvent event) {
         if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
-        if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return;
-        if (!SMART_PLACING.contains(event.getPlayer())) {
-            if (CONTAINERS.contains(event.getBlockAgainst().getType())) {
+        if (!smartPlaceEnabled(event.getPlayer())) return;
+        if (!isReallySneaking(event.getPlayer())) {
+            if (isContainer(event.getBlockAgainst())) {
                 SoundGroup soundGroup = event.getBlockPlaced().getBlockData().getSoundGroup();
                 event.getPlayer().playSound(event.getBlockPlaced().getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F);
             }

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

@@ -22,122 +22,71 @@ package de.steamwar.bausystem.features.util;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.utils.BauMemberUpdateEvent;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.ProtocolWrapper;
 import de.steamwar.core.SWPlayer;
 import de.steamwar.linkage.Linked;
-import net.minecraft.network.protocol.game.*;
-import net.minecraft.world.entity.player.Abilities;
-import net.minecraft.world.level.GameType;
-import org.bukkit.Bukkit;
+import io.papermc.paper.event.player.PlayerFailMoveEvent;
+import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
 import org.bukkit.GameMode;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockCanBuildEvent;
 import org.bukkit.event.player.PlayerGameModeChangeEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerToggleFlightEvent;
 
-import java.util.function.BiFunction;
-
 @Linked
 public class NoClipCommand extends SWCommand implements Listener {
 
     public static class NoClipData implements SWPlayer.Component {
-        private long lastTick = -1;
-
         @Override
-        public void onUnmount(SWPlayer player) {
-            player.setGameMode(GameMode.CREATIVE);
+        public void onUnmount(SWPlayer swPlayer) {
+            Player player = swPlayer.getPlayer();
+            showClientGameMode(player, GameMode.CREATIVE, GameMode.CREATIVE);
         }
     }
 
     public NoClipCommand() {
         super("noclip", "nc");
-
-        BiFunction<Player, ServerboundMovePlayerPacket, Object> first = (player, o) -> {
-            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
-            if (noClipData == null) return o;
-            if (noClipData.lastTick == TPSUtils.currentTick.get()) return o;
-            setInternalGameMode(player, GameMode.SPECTATOR);
-            noClipData.lastTick = TPSUtils.currentTick.get();
-            return o;
-        };
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.Pos.class, first);
-        TinyProtocol.instance.addFilter(ServerboundMovePlayerPacket.PosRot.class, first);
-
-        BiFunction<Player, Object, Object> second = (player, o) -> {
-            NoClipData noClipData = SWPlayer.of(player).getComponent(NoClipData.class).orElse(null);
-            if (noClipData == null) return o;
-            setInternalGameMode(player, GameMode.CREATIVE);
-            noClipData.lastTick = TPSUtils.currentTick.get();
-            return o;
-        };
-        TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, second);
-        TinyProtocol.instance.addFilter(ServerboundPlayerActionPacket.class, second);
-        TinyProtocol.instance.addFilter(ServerboundContainerClickPacket.class, second);
-
-        BiFunction<Player, ServerboundSetCreativeModeSlotPacket, Object> third = (player, o) -> {
-            if (SWPlayer.of(player).hasComponent(NoClipData.class)) {
-                int index = o.slotNum();
-                if (index >= 36 && index <= 44) {
-                    index -= 36;
-                } else if (index > 44) {
-                    index -= 5;
-                } else if (index <= 8) {
-                    index = index - 8 + 36;
-                }
-                player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(o.itemStack()));
-                if (index < 9) player.getInventory().setHeldItemSlot(index);
-                player.updateInventory();
-            }
-            return o;
-        };
-        TinyProtocol.instance.addFilter(ServerboundSetCreativeModeSlotPacket.class, third);
     }
 
-    private void setInternalGameMode(Player player, GameMode gameMode) {
-        ((CraftPlayer) player).getHandle().gameMode.gameModeForPlayer = GameType.byId(gameMode.getValue());
-    }
-
-    @Register(help = true)
+    @Register
     public void genericCommand(@Validator Player player) {
         SWPlayer swPlayer = SWPlayer.of(player);
         if (swPlayer.hasComponent(NoClipData.class)) {
             swPlayer.removeComponent(NoClipData.class);
         } else {
-            player.setGameMode(GameMode.SPECTATOR);
-            Abilities abilities = (((CraftPlayer) player).getHandle()).getAbilities();
-            abilities.mayBuild = true;
-            abilities.mayfly = true;
-
+            player.setGameMode(GameMode.CREATIVE);
+            player.setAllowFlight(true);
+            player.setFlying(true);
             swPlayer.setComponent(new NoClipData());
             BauSystem.MESSAGE.send("OTHER_NOCLIP_SLOT_INFO", player);
-            TinyProtocol.instance.sendPacket(player, new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, 1F));
-            pseudoGameMode(player, GameMode.SPECTATOR);
+            showClientGameMode(player, GameMode.CREATIVE, GameMode.SPECTATOR);
         }
     }
 
     @EventHandler
-    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
-        event.getNewSpectator().forEach(player -> {
-            SWPlayer.of(player).removeComponent(NoClipData.class);
-        });
+    public void onPlayerFailMove(PlayerFailMoveEvent event) {
+        if (event.getFailReason() != PlayerFailMoveEvent.FailReason.CLIPPED_INTO_BLOCK) return;
+        if (!SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) return;
+        event.setAllowed(true);
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
+    public void onBauMemberUpdate(BauMemberUpdateEvent event) {
+        event.getNewSpectator().forEach(player -> SWPlayer.of(player).removeComponent(NoClipData.class));
+    }
+
+    @EventHandler
     public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     public void onBlock(BlockCanBuildEvent event) {
         if (event.getPlayer() == null) return;
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
@@ -145,7 +94,7 @@ public class NoClipCommand extends SWCommand implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler
     public void onPlayerToggleFlight(PlayerToggleFlightEvent event) {
         if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
             event.setCancelled(true);
@@ -153,20 +102,13 @@ public class NoClipCommand extends SWCommand implements Listener {
         }
     }
 
-    @EventHandler(ignoreCancelled = true)
-    public void onPlayerTeleport(PlayerTeleportEvent event) {
-        if (event.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) {
-            return;
-        }
-        if (SWPlayer.of(event.getPlayer()).hasComponent(NoClipData.class)) {
-            event.setCancelled(true);
-            Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
-                event.getPlayer().setSpectatorTarget(null);
-            }, 1L);
-        }
+    /**
+     * @param player player
+     * @param localMode GameMode for breaking and placing
+     * @param listedMode GameMode for noPhysics
+     */
+    private static void showClientGameMode(Player player, GameMode localMode, GameMode listedMode) {
+        TinyProtocol.instance.sendPacket(player, new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, localMode.getValue()));
+        TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), listedMode));
     }
-
-    private static void pseudoGameMode(Player player, GameMode gameMode) {
-        TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), gameMode));
-    }
-}
+}

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");

SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java

@@ -21,8 +21,8 @@ package de.steamwar.core;
 
 import de.steamwar.message.Message;
 import lombok.Data;
+import lombok.Getter;
 import lombok.NonNull;
-import lombok.experimental.Delegate;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
@@ -99,11 +99,11 @@ public class SWPlayer {
 
     @Data
     public static final class SWPlayerWithComponent<T extends Component> {
-        private final SWPlayer player;
+        private final SWPlayer swPlayer;
         private final T component;
     }
 
-    @Delegate
+    @Getter
     private final Player player;
     private final Map<Class<? extends Component>, Component> components = new HashMap<>();
 

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

@@ -20,6 +20,7 @@
 package de.steamwar.core.worldedit;
 
 import com.comphenix.tinyprotocol.TinyProtocol;
+import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
@@ -29,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;
@@ -46,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;
 
@@ -64,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;
     }
@@ -86,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
@@ -103,35 +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) {
-            float distance = (float) player.getLocation().distanceSquared(location);
-            wireframe.setPos1And2(location, location);
-            float width = distance / 1600;
-            width = ((int) (width * 16)) / 16F;
-            width = Math.max(width, 1 / 16F);
-            width = Math.min(width, 1 / 2F);
-            wireframe.setWidth(width);
-            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;
@@ -338,7 +309,11 @@ public class SteamEditWand implements Listener {
     }
 
     private void selectPos1(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos1) {
-        if (!pos1.equals(regionSelector.getPrimaryPosition())) {
+        try {
+            if (!pos1.equals(regionSelector.getPrimaryPosition())) {
+                SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
+            }
+        } catch (IncompleteRegionException e) {
             SWPlayer.of(player).setComponent(new Pos1Message(regionSelector, player, session, pos1));
         }
         regionSelector.selectPrimary(pos1, PermissiveSelectorLimits.getInstance());
@@ -362,7 +337,11 @@ public class SteamEditWand implements Listener {
     }
 
     private void selectPos2(RegionSelector regionSelector, Player player, LocalSession session, BlockVector3 pos2) {
-        if (regionSelector.getVertices().size() == 2 && !pos2.equals(regionSelector.getVertices().get(1))) {
+        try {
+            if (regionSelector.getVertices().size() == 2 && !pos2.equals(regionSelector.getVertices().get(1))) {
+                SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
+            }
+        } catch (IncompleteRegionException e) {
             SWPlayer.of(player).setComponent(new Pos2Message(regionSelector, player, session, pos2));
         }
         regionSelector.selectSecondary(pos2, PermissiveSelectorLimits.getInstance());
@@ -377,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);
     }
 }

VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java

@@ -287,6 +287,10 @@ public class TeamCommand extends SWCommand {
 
     @Register(value = "info", description = "TEAM_INFO_USAGE")
     public void info(Chatter sender, @ErrorMessage("UNKNOWN_TEAM") Team team) {
+        if (team.getMembers().isEmpty()) {
+            sender.system("UNKNOWN_TEAM");
+            return;
+        }
         List<SteamwarUser> users = team.getMembers().stream().map(SteamwarUser::byId).toList();
 
         sender.system("TEAM_INFO_TEAM", team.getTeamName(), team.getTeamColor(), team.getTeamKuerzel());