Don't validate unloaded signs on startup (#85)
* Don't validate unloaded signs in startup * Actually stop loading chunks * Fix crash issues due to unwanted chunk loads in the sign ChunkLoadEvent listener * Delay chunk handling, fixes CMEs
This commit is contained in:
parent
bee85b0db1
commit
45b968820b
|
@ -186,7 +186,12 @@ public class WarpSignsManager {
|
||||||
// Load into map
|
// Load into map
|
||||||
if (warpsData != null) {
|
if (warpsData != null) {
|
||||||
warpsData.getWarpSigns().forEach((k,v) -> {
|
warpsData.getWarpSigns().forEach((k,v) -> {
|
||||||
if (k != null && k.getWorld() != null && k.getBlock().getType().name().contains("SIGN")) {
|
if (k != null && k.getWorld() != null) {
|
||||||
|
if (k.getWorld().isChunkLoaded(k.getBlockX() >> 4, k.getBlockZ() >> 4)
|
||||||
|
&& !k.getBlock().getType().name().contains("SIGN")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Add to map
|
// Add to map
|
||||||
getWarpMap(k.getWorld()).put(v, k);
|
getWarpMap(k.getWorld()).put(v, k);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
package world.bentobox.warps.listeners;
|
package world.bentobox.warps.listeners;
|
||||||
|
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.*;
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
@ -16,6 +14,8 @@ import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.block.BlockBreakEvent;
|
import org.bukkit.event.block.BlockBreakEvent;
|
||||||
import org.bukkit.event.block.SignChangeEvent;
|
import org.bukkit.event.block.SignChangeEvent;
|
||||||
|
|
||||||
|
import org.bukkit.event.world.ChunkLoadEvent;
|
||||||
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
import world.bentobox.bentobox.BentoBox;
|
import world.bentobox.bentobox.BentoBox;
|
||||||
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamKickEvent;
|
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamKickEvent;
|
||||||
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamLeaveEvent;
|
import world.bentobox.bentobox.api.events.team.TeamEvent.TeamLeaveEvent;
|
||||||
|
@ -44,6 +44,35 @@ public class WarpSignsListener implements Listener {
|
||||||
this.plugin = addon.getPlugin();
|
this.plugin = addon.getPlugin();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler(priority = EventPriority.NORMAL)
|
||||||
|
public void onChunkLoad(ChunkLoadEvent event) {
|
||||||
|
// Delay to wait the chunk to be fully loaded
|
||||||
|
new BukkitRunnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
boolean changed = false;
|
||||||
|
Iterator<Map.Entry<UUID, Location>> iterator =
|
||||||
|
addon.getWarpSignsManager().getWarpMap(event.getWorld()).entrySet().iterator();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
Map.Entry<UUID, Location> entry = iterator.next();
|
||||||
|
UUID uuid = entry.getKey();
|
||||||
|
Location location = entry.getValue();
|
||||||
|
if (event.getChunk().getX() == location.getBlockX() >> 4
|
||||||
|
&& event.getChunk().getZ() == location.getBlockZ() >> 4
|
||||||
|
&& !Tag.SIGNS.isTagged(location.getBlock().getType())) {
|
||||||
|
iterator.remove();
|
||||||
|
// Remove sign from warp panel cache
|
||||||
|
addon.getWarpPanelManager().removeWarp(event.getWorld(), uuid);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (changed) {
|
||||||
|
addon.getWarpSignsManager().saveWarpList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.runTask(plugin);
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
|
||||||
public void onPlayerLeave(TeamLeaveEvent e) {
|
public void onPlayerLeave(TeamLeaveEvent e) {
|
||||||
// Remove any warp signs from this game mode
|
// Remove any warp signs from this game mode
|
||||||
|
|
|
@ -20,13 +20,7 @@ import java.util.Map;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.*;
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.World.Environment;
|
import org.bukkit.World.Environment;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockFace;
|
import org.bukkit.block.BlockFace;
|
||||||
|
@ -165,7 +159,8 @@ public class WarpSignsManagerTest {
|
||||||
when(location.getBlockY()).thenReturn(24);
|
when(location.getBlockY()).thenReturn(24);
|
||||||
when(location.getBlockZ()).thenReturn(25);
|
when(location.getBlockZ()).thenReturn(25);
|
||||||
when(world.getEnvironment()).thenReturn(Environment.NORMAL);
|
when(world.getEnvironment()).thenReturn(Environment.NORMAL);
|
||||||
|
when(world.isChunkLoaded(anyInt(), anyInt())).thenReturn(true);
|
||||||
|
|
||||||
// Block
|
// Block
|
||||||
when(block.getType()).thenReturn(Material.ACACIA_SIGN);
|
when(block.getType()).thenReturn(Material.ACACIA_SIGN);
|
||||||
when(block.getLocation()).thenReturn(location);
|
when(block.getLocation()).thenReturn(location);
|
||||||
|
|
Loading…
Reference in New Issue