Hut512/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Make Smart Place thread safe

Browse Source
This commit is contained in:
Hut512
2026-09-22 00:58:36 +02:00
committed by fiercehut
parent 4306fe7bc9
commit cb6906e2ec
1 changed files with 66 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java
+66 -74
View File
@@ -19,12 +19,10 @@
package de.steamwar.bausystem.features.smartplace; package de.steamwar.bausystem.features.smartplace;
import com.comphenix.tinyprotocol.TinyProtocol;
import de.steamwar.bausystem.BauSystem; import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.Permission;
import de.steamwar.bausystem.configplayer.Config; import de.steamwar.bausystem.configplayer.Config;
import de.steamwar.linkage.Linked; import de.steamwar.linkage.Linked;
import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
@@ -34,104 +32,98 @@ import org.bukkit.block.data.*;
import org.bukkit.block.data.type.*; import org.bukkit.block.data.type.*;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.util.RayTraceResult;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Linked @Linked
public class SmartPlaceListener implements Listener { public class SmartPlaceListener implements Listener {
private static final Set<Material> CONTAINERS = new HashSet<>(); private static final Set<Material> IGNORED = Set.of(Material.TNT, Material.REDSTONE_ORE, Material.BEEHIVE, Material.SEA_PICKLE);
private static final Set<Material> IGNORED = new HashSet<>();
static { private static final Set<UUID> FAKED_SNEAK = new HashSet<>();
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);
IGNORED.add(Material.TNT); private static boolean isContainer(Block block) {
IGNORED.add(Material.REDSTONE_ORE); if (block.getType() == Material.COMPARATOR) return false;
IGNORED.add(Material.BEEHIVE); if (block.getType() == Material.GRINDSTONE) return true;
IGNORED.add(Material.SEA_PICKLE); return block.getState() instanceof TileState || block.getBlockData() instanceof Stairs;
IGNORED.remove(Material.STONE);
IGNORED.remove(Material.BARRIER);
} }
private static final Set<Player> SMART_PLACING = new HashSet<>(); private static boolean isReallySneaking(Player player) {
private static final Set<Player> WAS_EXECUTED = new HashSet<>(); return player.isSneaking() && !FAKED_SNEAK.contains(player.getUniqueId());
}
public SmartPlaceListener() { private static boolean shouldSmartPlace(Block block, BlockFace blockFace, Material heldType) {
TinyProtocol.instance.addFilter(ServerboundUseItemOnPacket.class, (player, packet) -> { boolean smartPlace = false;
if (!Permission.BUILD.hasPermission(player)) return packet; if (block.getType().isInteractable() || block.getType() == Material.NOTE_BLOCK) {
if (!Config.getInstance().get(player).getPlainValueOrDefault("smartPlace", false)) return packet; smartPlace = true;
RayTraceResult rayTraceResult = player.rayTraceBlocks(6); }
Block block = rayTraceResult != null ? rayTraceResult.getHitBlock() : null; if (isContainer(block)) {
BlockFace blockFace = rayTraceResult != null ? rayTraceResult.getHitBlockFace() : null; if (heldType == Material.TNT) {
boolean shouldSneak = false; if (block.getType() == Material.CHEST || block.getType() == Material.BARREL || block.getType().name().endsWith("SHULKER_BOX")) {
if (block != null) { smartPlace = false;
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;
} }
} }
boolean sneaking = player.isSneaking(); } else {
if (sneaking) SMART_PLACING.add(player); smartPlace = false;
player.setSneaking(shouldSneak || sneaking); }
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> { if (IGNORED.contains(block.getType())) {
SMART_PLACING.remove(player); smartPlace = false;
player.setSneaking(sneaking); }
}, 0); if (blockFace == BlockFace.DOWN && (block.getType() == Material.REPEATER || block.getType() == Material.COMPARATOR) && heldType.isSolid()) {
return packet; 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 @EventHandler
public void onPlayerInteract(PlayerInteractEvent event) { public void onPlayerInteract(PlayerInteractEvent event) {
if (!Permission.BUILD.hasPermission(event.getPlayer())) return; if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return; if (!smartPlaceEnabled(event.getPlayer())) return;
WAS_EXECUTED.add(event.getPlayer());
if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return; if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
if (event.getPlayer().getGameMode() == GameMode.SPECTATOR) 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.getClickedBlock().getType() != Material.REPEATER) return;
if ((event.getItem() == null || event.getItem().getType() == Material.REPEATER)) { if ((event.getItem() == null || event.getItem().getType() == Material.REPEATER)) {
Repeater repeater = (Repeater) event.getClickedBlock().getBlockData(); Repeater repeater = (Repeater) event.getClickedBlock().getBlockData();
@@ -146,9 +138,9 @@ public class SmartPlaceListener implements Listener {
@EventHandler @EventHandler
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if (!Permission.BUILD.hasPermission(event.getPlayer())) return; if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
if (!Config.getInstance().get(event.getPlayer()).getPlainValueOrDefault("smartPlace", false)) return; if (!smartPlaceEnabled(event.getPlayer())) return;
if (!SMART_PLACING.contains(event.getPlayer())) { if (!isReallySneaking(event.getPlayer())) {
if (CONTAINERS.contains(event.getBlockAgainst().getType())) { if (isContainer(event.getBlockAgainst())) {
SoundGroup soundGroup = event.getBlockPlaced().getBlockData().getSoundGroup(); SoundGroup soundGroup = event.getBlockPlaced().getBlockData().getSoundGroup();
event.getPlayer().playSound(event.getBlockPlaced().getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F); event.getPlayer().playSound(event.getBlockPlaced().getLocation(), soundGroup.getPlaceSound(), soundGroup.getVolume() * 0.8F, soundGroup.getPitch() * 0.8F);
} }