diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a6584e82..4d7dea546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,21 @@ # Changelog +## 7.0.21 + +* Improved protection checks for placing cushions. +* Fixed straw beds not being treated as beds for certain flags. +* Fixed cases where creepers could lose tracking of players who triggered them to explode. +* Improved caching to ensure unloaded worlds are not kept around in memory longer than necessary. +* Improved Folia detection to better detect Folia forks. +* Fixed errors on Folia caused by complex cross-world block interactions. + ## 7.0.20 * Require 26.3+. * Fixed poplar boats causing errors in some situations. * Support Paper's new EntityBreakEvent (used for cushion destruction) in protection. * Improved handling of buckets on waterlogged blocks when sneaking. -* Fixed a Folia error caused by entity actions occuring across Folia region boundaries. +* Fixed a Folia error caused by entity actions occurring across Folia region boundaries. * Improved command feedback when setting a state flag to "none". ## 7.0.19 diff --git a/gradle.properties b/gradle.properties index 502f834cf..8a90b39a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=com.sk89q.worldguard -version=7.0.21-SNAPSHOT +version=7.0.22-SNAPSHOT org.gradle.parallel=true diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java index 0120477d5..6d651df70 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java @@ -91,7 +91,7 @@ public BukkitWorldConfiguration(WorldGuardPlugin plugin, String worldName, YAMLP plugin.createDefaultConfiguration(configFile, "config_world.yml"); plugin.createDefaultConfiguration(blacklistFile, "blacklist.txt"); - config = new YAMLProcessor(configFile, true, YAMLFormat.EXTENDED); + config = new YAMLProcessor(configFile.toPath(), true, YAMLFormat.EXTENDED); loadConfiguration(); if (summaryOnStart) { @@ -298,7 +298,7 @@ public void loadConfiguration() { explosionFlagCancellation = getBoolean("regions.explosion-flags-block-entity-damage", true); highFreqFlags = getBoolean("regions.high-frequency-flags", false); checkLiquidFlow = getBoolean("regions.protect-against-liquid-flow", false); - regionWand = convertLegacyItem(getString("regions.wand", ItemTypes.LEATHER.getId())); + regionWand = convertLegacyItem(getString("regions.wand", ItemTypes.LEATHER.id())); maxClaimVolume = getInt("regions.max-claim-volume", 30000); claimOnlyInsideExistingRegions = getBoolean("regions.claim-only-inside-existing-regions", false); setParentOnClaim = getString("regions.set-parent-on-claim", ""); diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index 80527ad15..b83990305 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -560,8 +560,11 @@ public PlayerMoveListener getPlayerMoveListener() { private final LazyReference folia = LazyReference.from(() -> { try { return getWorldEdit().isFolia(); // Delegate check to WorldEdit - } catch (Throwable t) { + } catch (NoSuchMethodError _) { // Ignore, this likely means an outdated version. + LOGGER.warn("Failed to check if server is running Folia, as WorldEdit's Folia support is missing."); + } catch (Throwable t) { + // Unknown error, log it and return false. LOGGER.warn("Failed to check if server is running Folia", t); } return false; diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java index 643dc3e4b..459fa0322 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java @@ -179,7 +179,8 @@ public Entity getFirstNonPlayerEntity() { @Nullable public Block getFirstBlock() { for (Object object : causes) { - if (object instanceof Block b) { + if (object instanceof Block b && (!WorldGuardPlugin.inst().isFolia() + || Bukkit.isOwnedByCurrentRegion(b.getLocation()))) { return b; } } diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java index 0b274f505..267e7ea37 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java @@ -246,7 +246,7 @@ public void onBlockPlace(BlockPlaceEvent event) { BlockState previousState = event.getBlockReplacedState(); // Some blocks, like tall grass and fire, get replaced - if (previousState.getType() != Material.AIR && previousState.getType() != event.getBlockReplacedState().getType()) { + if (previousState.getType() != Material.AIR && previousState.getType() != event.getBlockPlaced().getType()) { Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), previousState.getLocation(), previousState.getType())); } diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java index 83e1c1f35..98cfcb34d 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java @@ -154,7 +154,7 @@ public void onBlockFromTo(BlockFromToEvent event) { Material targetId = blockTo.getType(); if ((isAir || isWater) && - wcfg.preventWaterDamage.contains(BukkitAdapter.asBlockType(targetId).getId())) { + wcfg.preventWaterDamage.contains(BukkitAdapter.asBlockType(targetId).id())) { event.setCancelled(true); return; } @@ -163,7 +163,7 @@ public void onBlockFromTo(BlockFromToEvent event) { if (!wcfg.allowedLavaSpreadOver.isEmpty() && isLava) { Material targetId = blockTo.getRelative(0, -1, 0).getType(); - if (!wcfg.allowedLavaSpreadOver.contains(BukkitAdapter.asBlockType(targetId).getId())) { + if (!wcfg.allowedLavaSpreadOver.contains(BukkitAdapter.asBlockType(targetId).id())) { event.setCancelled(true); return; } @@ -233,11 +233,11 @@ public void onBlockIgnite(BlockIgniteEvent event) { int y = block.getY(); int z = block.getZ(); - if (wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x, y - 1, z).getType()).getId()) - || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x + 1, y, z).getType()).getId()) - || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x - 1, y, z).getType()).getId()) - || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x, y, z - 1).getType()).getId()) - || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x, y, z + 1).getType()).getId())) { + if (wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x, y - 1, z).getType()).id()) + || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x + 1, y, z).getType()).id()) + || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x - 1, y, z).getType()).id()) + || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x, y, z - 1).getType()).id()) + || wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(world.getBlockAt(x, y, z + 1).getType()).id())) { event.setCancelled(true); return; } @@ -303,7 +303,7 @@ public void onBlockBurn(BlockBurnEvent event) { if (!wcfg.disableFireSpreadBlocks.isEmpty()) { Block block = event.getBlock(); - if (wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(block.getType()).getId())) { + if (wcfg.disableFireSpreadBlocks.contains(BukkitAdapter.asBlockType(block.getType()).id())) { event.setCancelled(true); checkAndDestroyFireAround(block.getWorld(), block.getX(), block.getY(), block.getZ()); return; @@ -511,7 +511,7 @@ public void onBlockForm(BlockFormEvent event) { if (!wcfg.allowedSnowFallOver.isEmpty()) { Material targetId = event.getBlock().getRelative(0, -1, 0).getType(); - if (!wcfg.allowedSnowFallOver.contains(BukkitAdapter.asBlockType(targetId).getId())) { + if (!wcfg.allowedSnowFallOver.contains(BukkitAdapter.asBlockType(targetId).id())) { event.setCancelled(true); return; } diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java index 7edd44420..72dea41c5 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java @@ -82,7 +82,7 @@ public void onLightningStrike(LightningStrikeEvent event) { if (targetId == Material.AIR) { targetId = target.getRelative(BlockFace.DOWN).getType(); } - if (wcfg.disallowedLightningBlocks.contains(BukkitAdapter.asBlockType(targetId).getId())) { + if (wcfg.disallowedLightningBlocks.contains(BukkitAdapter.asBlockType(targetId).id())) { event.setCancelled(true); } } diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java index 1675e4b78..31cdd3c27 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java @@ -27,7 +27,7 @@ import org.bukkit.event.Event; import javax.annotation.Nullable; -import java.util.concurrent.TimeUnit; +import java.time.Duration; public class EventDebounce { @@ -36,7 +36,7 @@ public class EventDebounce { public EventDebounce(int debounceTime) { cache = CacheBuilder.newBuilder() .maximumSize(1000) - .expireAfterWrite(debounceTime, TimeUnit.MILLISECONDS) + .expireAfterWrite(Duration.ofMillis(debounceTime)) .concurrencyLevel(2) .build(new CacheLoader() { @Override diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java index b7ec0d8d2..3060ceeca 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java @@ -27,7 +27,7 @@ import org.bukkit.event.Event; import javax.annotation.Nullable; -import java.util.concurrent.TimeUnit; +import java.time.Duration; public class AbstractEventDebounce { @@ -36,7 +36,7 @@ public class AbstractEventDebounce { AbstractEventDebounce(int debounceTime) { cache = CacheBuilder.newBuilder() .maximumSize(1000) - .expireAfterWrite(debounceTime, TimeUnit.MILLISECONDS) + .expireAfterWrite(Duration.ofMillis(debounceTime)) .concurrencyLevel(2) .build(new CacheLoader() { @Override diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java index fa8af1a35..8e5d80cab 100644 --- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java +++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java @@ -21,10 +21,12 @@ import com.sk89q.worldguard.protection.flags.Flags; import com.sk89q.worldguard.protection.flags.StateFlag; +import org.bukkit.Tag; import org.bukkit.entity.Allay; import org.bukkit.entity.Ambient; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Arrow; +import org.bukkit.entity.Boat; import org.bukkit.entity.BreezeWindCharge; import org.bukkit.entity.Creature; import org.bukkit.entity.Creeper; @@ -69,7 +71,7 @@ private Entities() { * @return true if tamed */ public static boolean isTamed(@Nullable Entity entity) { - return entity instanceof Tameable && ((Tameable) entity).isTamed(); + return entity instanceof Tameable tameable && tameable.isTamed(); } /** @@ -122,13 +124,8 @@ public static boolean isVehicle(EntityType type) { * @return true if the type is a Boat type */ public static boolean isBoat(EntityType type) { - return switch (type) { - case OAK_BOAT, DARK_OAK_BOAT, SPRUCE_BOAT, ACACIA_BOAT, CHERRY_BOAT, JUNGLE_BOAT, MANGROVE_BOAT, - BIRCH_BOAT, PALE_OAK_BOAT, BAMBOO_RAFT, OAK_CHEST_BOAT, DARK_OAK_CHEST_BOAT, SPRUCE_CHEST_BOAT, - ACACIA_CHEST_BOAT, CHERRY_CHEST_BOAT, JUNGLE_CHEST_BOAT, MANGROVE_CHEST_BOAT, BIRCH_CHEST_BOAT, - PALE_OAK_CHEST_BOAT, BAMBOO_CHEST_RAFT -> true; - default -> false; - }; + Class entityClass = type.getEntityClass(); + return entityClass != null && Boat.class.isAssignableFrom(entityClass); } /** @@ -153,8 +150,7 @@ public static boolean isMinecart(EntityType type) { */ public static Entity getShooter(Entity entity) { - while (entity instanceof Projectile) { - Projectile projectile = (Projectile) entity; + while (entity instanceof Projectile projectile) { ProjectileSource remover = projectile.getShooter(); if (remover instanceof Entity && remover != entity) { entity = (Entity) remover; @@ -261,16 +257,14 @@ public static boolean isPluginSpawning(CreatureSpawnEvent.SpawnReason spawnReaso */ public static @Nonnull StateFlag getExplosionFlag(Entity entity) { return switch (entity) { - case BreezeWindCharge breezeWindCharge -> Flags.BREEZE_WIND_CHARGE; - case WindCharge windCharge -> Flags.WIND_CHARGE_BURST; - case Firework firework -> Flags.FIREWORK_DAMAGE; - case Fireball fireball -> Flags.GHAST_FIREBALL; - case Wither wither -> Flags.WITHER_DAMAGE; - case Creeper creeper -> Flags.CREEPER_EXPLOSION; - case TNTPrimed tnt -> Flags.TNT; - case SulfurCube sulfurCube -> Flags.TNT; - case ExplosiveMinecart minecart -> Flags.TNT; - case EnderDragon dragon -> Flags.ENDERDRAGON_BLOCK_DAMAGE; + case BreezeWindCharge _ -> Flags.BREEZE_WIND_CHARGE; + case WindCharge _ -> Flags.WIND_CHARGE_BURST; + case Firework _ -> Flags.FIREWORK_DAMAGE; + case Fireball _ -> Flags.GHAST_FIREBALL; + case Wither _ -> Flags.WITHER_DAMAGE; + case Creeper _ -> Flags.CREEPER_EXPLOSION; + case TNTPrimed _, SulfurCube _, ExplosiveMinecart _ -> Flags.TNT; + case EnderDragon _ -> Flags.ENDERDRAGON_BLOCK_DAMAGE; case null, default -> Flags.OTHER_EXPLOSION; }; } diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java index 5d496a1a3..c6a945214 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java @@ -37,9 +37,9 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.time.Duration; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; @@ -53,7 +53,7 @@ public class Blacklist { private boolean useAsWhitelist; private LoadingCache repeatingEventCache = CacheBuilder.newBuilder() .maximumSize(1000) - .expireAfterAccess(30, TimeUnit.SECONDS) + .expireAfterAccess(Duration.ofSeconds(30)) .build(CacheLoader.from(TrackedEvent::new)); public Blacklist(boolean useAsWhitelist) { diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/BlockMatcher.java b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/BlockMatcher.java index 28a6204c6..1d320f2e3 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/BlockMatcher.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/BlockMatcher.java @@ -31,7 +31,7 @@ public BlockMatcher(BlockType type) { @Override public String getMatchedTypeId() { - return this.type.getId(); + return this.type.id(); } @Override diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemBlockMatcher.java b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemBlockMatcher.java index 7cb893ec4..8c12373bc 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemBlockMatcher.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemBlockMatcher.java @@ -31,7 +31,7 @@ public ItemBlockMatcher(BlockType type) { @Override public String getMatchedTypeId() { - return this.type.getId(); + return this.type.id(); } @Override diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemMatcher.java b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemMatcher.java index 6a7820086..1fb57ac7e 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemMatcher.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/target/ItemMatcher.java @@ -31,7 +31,7 @@ public ItemMatcher(ItemType type) { @Override public String getMatchedTypeId() { - return this.type.getId(); + return this.type.id(); } @Override diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java b/worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java index e042cf4a8..58fac4ed8 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java @@ -212,13 +212,13 @@ public String convertLegacyItem(String legacy) { } ItemType legacyItem = LegacyMapper.getInstance().getItemFromLegacy(id, data); if (legacyItem != null) { - return legacyItem.getId(); + return legacyItem.id(); } } catch (NumberFormatException ignored) { } final ItemType itemType = ItemTypes.get(legacy); if (itemType != null) { - return itemType.getId(); + return itemType.id(); } return null; @@ -242,13 +242,13 @@ public String convertLegacyBlock(String legacy) { } BlockState legacyBlock = LegacyMapper.getInstance().getBlockFromLegacy(id, data); if (legacyBlock != null) { - return legacyBlock.getBlockType().getId(); + return legacyBlock.getBlockType().id(); } } catch (NumberFormatException ignored) { } final BlockType blockType = BlockTypes.get(legacy); if (blockType != null) { - return blockType.getId(); + return blockType.id(); } return null; diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/config/YamlConfigurationManager.java b/worldguard-core/src/main/java/com/sk89q/worldguard/config/YamlConfigurationManager.java index f237a5ae5..64952a07b 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/config/YamlConfigurationManager.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/config/YamlConfigurationManager.java @@ -44,7 +44,7 @@ public abstract class YamlConfigurationManager extends ConfigurationManager { public void load() { copyDefaults(); - config = new YAMLProcessor(new File(getDataFolder(), "config.yml"), true, YAMLFormat.EXTENDED); + config = new YAMLProcessor(new File(getDataFolder(), "config.yml").toPath(), true, YAMLFormat.EXTENDED); try { config.load(); } catch (IOException e) { diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java index 0d36e4dcf..3fb5dea4b 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java @@ -333,7 +333,7 @@ private void setDomainData(Map domainData, String key, Set do */ private YAMLProcessor createYamlProcessor(File file) { checkNotNull(file); - return new YAMLProcessor(file, false, YAMLFormat.COMPACT); + return new YAMLProcessor(file.toPath(), false, YAMLFormat.COMPACT); } /** diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java index 4c8a00ff8..46d3afc99 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java @@ -43,6 +43,7 @@ public class DomainInputResolver implements Callable { private static final Pattern GROUP_PATTERN = Pattern.compile("(?i)^[G]:(.+)$"); + private static final int MAX_PLAYER_NAME_LENGTH = 16; /** * The policy for locating users. @@ -119,9 +120,14 @@ public DefaultDomain call() throws UnresolvedNamesException { } } - if (!namesToQuery.isEmpty()) { + // Paper rejects longer names with an exception, so leave them unresolved. + List validNames = namesToQuery.stream() + .filter(name -> name.length() <= MAX_PLAYER_NAME_LENGTH) + .toList(); + + if (!validNames.isEmpty()) { try { - for (Profile profile : profileService.findAllByName(namesToQuery)) { + for (Profile profile : profileService.findAllByName(validNames)) { namesToQuery.remove(profile.getName().toLowerCase()); domain.addPlayer(profile.getUniqueId()); } diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/session/AbstractSessionManager.java b/worldguard-core/src/main/java/com/sk89q/worldguard/session/AbstractSessionManager.java index 0f9a05882..5b1525d69 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/session/AbstractSessionManager.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/session/AbstractSessionManager.java @@ -21,8 +21,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; import com.sk89q.worldedit.world.World; import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.WorldGuard; @@ -43,12 +41,11 @@ import com.sk89q.worldguard.session.handler.WeatherLockFlag; import javax.annotation.Nullable; -import java.lang.ref.WeakReference; +import java.time.Duration; import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import java.util.concurrent.TimeUnit; import java.util.function.BiPredicate; import java.util.logging.Level; @@ -59,21 +56,19 @@ public abstract class AbstractSessionManager implements SessionManager { public static final int RUN_DELAY = 20; public static final long SESSION_LIFETIME = 10; - private static final BiPredicate BYPASS_PERMISSION_TEST = (world, player) -> { - return player.hasPermission("worldguard.region.bypass." + world.getName()); - }; + private static final BiPredicate BYPASS_PERMISSION_TEST = (world, player) -> player.hasPermission("worldguard.region.bypass." + world.getName()); - private final LoadingCache bypassCache = CacheBuilder.newBuilder() + private final Cache bypassCache = CacheBuilder.newBuilder() .maximumSize(1000) - .expireAfterWrite(2, TimeUnit.SECONDS) - .build(CacheLoader.from(tuple -> BYPASS_PERMISSION_TEST.test(tuple.getWorld(), tuple.getPlayer()))); + .expireAfterWrite(Duration.ofSeconds(2)) + .build(); - private final Cache sessions = CacheBuilder.newBuilder() - .expireAfterAccess(SESSION_LIFETIME, TimeUnit.MINUTES) + private final Cache sessions = CacheBuilder.newBuilder() + .expireAfterAccess(Duration.ofMinutes(SESSION_LIFETIME)) .build(); private boolean hasCustom = false; - private List> handlers = new LinkedList<>(); + private final List> handlers = new LinkedList<>(); private static final List> defaultHandlers = new LinkedList<>(); @@ -146,13 +141,20 @@ public boolean hasBypass(LocalPlayer player, World world) { return BYPASS_PERMISSION_TEST.test(world, player); } - return bypassCache.getUnchecked(new WorldPlayerTuple(world, player)); + var bypassCacheKey = new BypassCacheKey(world.getName(), player.getUniqueId()); + Boolean bypass = bypassCache.getIfPresent(bypassCacheKey); + if (bypass == null) { + bypass = BYPASS_PERMISSION_TEST.test(world, player); + bypassCache.put(bypassCacheKey, bypass); + } + + return bypass; } @Override public void resetState(LocalPlayer player) { checkNotNull(player, "player"); - @Nullable Session session = getIfPresentInternal(new CacheKey(player)); + @Nullable Session session = getIfPresentInternal(player); if (session != null) { session.resetState(player); } @@ -161,13 +163,13 @@ public void resetState(LocalPlayer player) { @Override @Nullable public Session getIfPresent(LocalPlayer player) { - return getIfPresentInternal(new CacheKey(player)); + return getIfPresentInternal(player); } - private Session getIfPresentInternal(CacheKey cacheKey) { - @Nullable Session session = sessions.getIfPresent(cacheKey); + private Session getIfPresentInternal(LocalPlayer player) { + @Nullable Session session = sessions.getIfPresent(player.getUniqueId()); if (session != null) { - session.ensureInitialized(cacheKey.playerRef.get(), this::initializeSession); + session.ensureInitialized(player, this::initializeSession); return session; } return null; @@ -175,7 +177,11 @@ private Session getIfPresentInternal(CacheKey cacheKey) { @Override public Session get(LocalPlayer player) { - Session session = sessions.asMap().computeIfAbsent(new CacheKey(player), (k) -> new Session(this)); + Session session = sessions.getIfPresent(player.getUniqueId()); + if (session == null) { + session = new Session(this); + sessions.put(player.getUniqueId(), session); + } session.ensureInitialized(player, this::initializeSession); return session; } @@ -192,27 +198,6 @@ private void initializeSession(Session session, LocalPlayer player) { session.initialize(player); } - protected static final class CacheKey { - final WeakReference playerRef; - final UUID uuid; - - CacheKey(LocalPlayer player) { - playerRef = new WeakReference<>(player); - uuid = player.getUniqueId(); - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - CacheKey cacheKey = (CacheKey) o; - return uuid.equals(cacheKey.uuid); - - } - - @Override - public int hashCode() { - return uuid.hashCode(); - } + record BypassCacheKey(String worldName, UUID playerUUID) { } } diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java b/worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java index fe42bbaae..aabfde73f 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java @@ -143,6 +143,9 @@ public void uninitialize(LocalPlayer player) { for (Handler handler : handlers.values()) { handler.uninitialize(player, location, set); } + + lastValid = null; + lastRegionSet = null; } /** @@ -224,6 +227,12 @@ public Location testMoveTo(LocalPlayer player, Location to, MoveType moveType) { */ @Nullable public Location testMoveTo(LocalPlayer player, Location to, MoveType moveType, boolean forced) { + if (lastValid == null) { + // If lastValid is null, the session has not yet been initialized. This shouldn't happen, but theoretically + // can due to Bukkit event orderings. + return null; + } + RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery(); if (!forced && needRefresh.getAndSet(false)) { diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java b/worldguard-core/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java index 8996e147e..7b2facf7c 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java @@ -22,6 +22,7 @@ import com.sk89q.worldedit.world.World; import com.sk89q.worldguard.LocalPlayer; +@Deprecated(forRemoval = true) public class WorldPlayerTuple { private final World world; diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/ApplicableRegionsReport.java b/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/ApplicableRegionsReport.java index 2ad34abbb..33a2acc31 100644 --- a/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/ApplicableRegionsReport.java +++ b/worldguard-core/src/main/java/com/sk89q/worldguard/util/report/ApplicableRegionsReport.java @@ -31,7 +31,7 @@ public class ApplicableRegionsReport extends DataReport { public ApplicableRegionsReport(LocalPlayer player) { super("Applicable regions"); - BlockVector3 position = player.getBlockIn().toVector().toBlockPoint(); + BlockVector3 position = player.getBlockLocation().toVector().toBlockPoint(); append("Location", player.getWorld().getName() + " @ " + position); RegionManager mgr = WorldGuard.getInstance().getPlatform().getRegionContainer().get(player.getWorld()); if (mgr == null) {