zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Improved logic for logging brushing of suspicious blocks

Browse source
This commit is contained in:
Intelli 2023-07-14 14:59:18 -06:00
parent 05aebe7544
commit c6a0f20fff
1 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java
View file

@ -64,6 +64,7 @@ import net.coreprotect.utility.Util;
public final class PlayerInteractListener extends Queue implements Listener { public final class PlayerInteractListener extends Queue implements Listener {
public static ConcurrentHashMap<String, Object[]> lastInspectorEvent = new ConcurrentHashMap<>(); public static ConcurrentHashMap<String, Object[]> lastInspectorEvent = new ConcurrentHashMap<>();
public static ConcurrentHashMap<String, Object[]> suspiciousBlockEvent = new ConcurrentHashMap<>();
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
protected void onPlayerInspect(PlayerInteractEvent event) { protected void onPlayerInspect(PlayerInteractEvent event) {
@ -752,15 +753,43 @@ public final class PlayerInteractListener extends Queue implements Listener {
} }
} }
else if (BukkitAdapter.ADAPTER.isSuspiciousBlock(type)) { else if (BukkitAdapter.ADAPTER.isSuspiciousBlock(type)) {
ItemStack handItem = null;
ItemStack mainHand = player.getInventory().getItemInMainHand();
ItemStack offHand = player.getInventory().getItemInOffHand();
if (event.getHand().equals(EquipmentSlot.HAND) && mainHand != null) {
handItem = mainHand;
}
else if (event.getHand().equals(EquipmentSlot.OFF_HAND) && offHand != null) {
handItem = offHand;
}
if (handItem.getType() == Material.BRUSH) {
BlockState blockState = block.getState(); BlockState blockState = block.getState();
Location blockLocation = block.getLocation();
Scheduler.scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> { Scheduler.scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> {
Material newType = block.getType(); Material newType = block.getType();
if (type == newType || (type != Material.SAND && type != Material.GRAVEL)) { if (type == newType || (newType != Material.SAND && newType != Material.GRAVEL)) {
return; return;
} }
long systemTime = System.currentTimeMillis();
boolean logChange = true;
if (suspiciousBlockEvent.get(player.getName()) != null) {
Object[] lastEvent = suspiciousBlockEvent.get(player.getName());
long lastTime = (long) lastEvent[0];
long timeSince = systemTime - lastTime;
Location lastLocation = (Location) lastEvent[1];
if (timeSince < 5000 && blockLocation.equals(lastLocation)) {
logChange = false;
}
}
if (logChange) {
Queue.queueBlockPlace(player.getName(), blockState, newType, blockState, newType, -1, 0, null); Queue.queueBlockPlace(player.getName(), blockState, newType, blockState, newType, -1, 0, null);
}, block.getLocation(), 100); suspiciousBlockEvent.put(player.getName(), new Object[] { systemTime, blockLocation });
}
}, blockLocation, 100);
}
} }
else if (type == Material.DRAGON_EGG) { else if (type == Material.DRAGON_EGG) {
clickedDragonEgg(player, block); clickedDragonEgg(player, block);