From 6a54328f7dddc62951aa30ea138c221d2a31091b Mon Sep 17 00:00:00 2001 From: Hannes Greule Date: Sun, 19 Jun 2022 01:59:43 +0200 Subject: [PATCH 1/8] refactor: replace usages of switch over keyed enums (#3673) --- .../bukkit/listener/BlockEventListener.java | 187 ++++++++---------- .../listener/BlockEventListener117.java | 47 +++-- .../bukkit/listener/EntitySpawnListener.java | 37 ++-- .../bukkit/listener/PaperListener.java | 18 +- .../bukkit/listener/PlayerEventListener.java | 78 +++++--- 5 files changed, 177 insertions(+), 190 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java index 63b44ef63..06c1f3e66 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java @@ -65,6 +65,7 @@ import net.kyori.adventure.text.minimessage.Template; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; @@ -106,11 +107,20 @@ import org.checkerframework.checker.nullness.qual.NonNull; import java.util.Iterator; import java.util.List; import java.util.Objects; +import java.util.Set; import java.util.UUID; @SuppressWarnings("unused") public class BlockEventListener implements Listener { + private static final Set PISTONS = Set.of( + Material.PISTON, + Material.STICKY_PISTON + ); + private static final Set PHYSICS_BLOCKS = Set.of( + Material.TURTLE_EGG, + Material.TURTLE_SPAWN_EGG + ); private final PlotAreaManager plotAreaManager; private final WorldEdit worldEdit; @@ -216,48 +226,31 @@ public class BlockEventListener implements Listener { plot.debug("Prevented block physics and resent block change because disable-physics = true"); return; } - switch (event.getChangedType()) { - case COMPARATOR: { - if (!plot.getFlag(RedstoneFlag.class)) { - event.setCancelled(true); - plot.debug("Prevented comparator update because redstone = false"); - } - return; + if (event.getChangedType() == Material.COMPARATOR) { + if (!plot.getFlag(RedstoneFlag.class)) { + event.setCancelled(true); + plot.debug("Prevented comparator update because redstone = false"); } - case ANVIL: - case DRAGON_EGG: - case GRAVEL: - case SAND: - case TURTLE_EGG: - case TURTLE_HELMET: - case TURTLE_SPAWN_EGG: { - if (plot.getFlag(DisablePhysicsFlag.class)) { - event.setCancelled(true); - plot.debug("Prevented block physics because disable-physics = true"); - } - return; + return; + } + if (PHYSICS_BLOCKS.contains(event.getChangedType())) { + if (plot.getFlag(DisablePhysicsFlag.class)) { + event.setCancelled(true); + plot.debug("Prevented block physics because disable-physics = true"); } - default: - if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) { - switch (block.getType()) { - case PISTON, STICKY_PISTON -> { - org.bukkit.block.data.Directional piston = (org.bukkit.block.data.Directional) block.getBlockData(); - switch (piston.getFacing()) { - case EAST -> location = location.add(1, 0, 0); - case SOUTH -> location = location.add(-1, 0, 0); - case WEST -> location = location.add(0, 0, 1); - case NORTH -> location = location.add(0, 0, -1); - } - Plot newPlot = area.getOwnedPlotAbs(location); - if (!plot.equals(newPlot)) { - event.setCancelled(true); - plot.debug("Prevented piston update because of invalid edge piston detection"); - return; - } - } - } + return; + } + if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) { + if (PISTONS.contains(block.getType())) { + org.bukkit.block.data.Directional piston = (org.bukkit.block.data.Directional) block.getBlockData(); + final BlockFace facing = piston.getFacing(); + location = location.add(facing.getModX(), facing.getModY(), facing.getModZ()); + Plot newPlot = area.getOwnedPlotAbs(location); + if (!plot.equals(newPlot)) { + event.setCancelled(true); + plot.debug("Prevented piston update because of invalid edge piston detection"); } - break; + } } } @@ -548,21 +541,18 @@ public class BlockEventListener implements Listener { event.setCancelled(true); return; } - switch (event.getNewState().getType()) { - case SNOW: - case SNOW_BLOCK: - if (!plot.getFlag(SnowFormFlag.class)) { - plot.debug("Snow could not form because snow-form = false"); - event.setCancelled(true); - } - return; - case ICE: - case FROSTED_ICE: - case PACKED_ICE: - if (!plot.getFlag(IceFormFlag.class)) { - plot.debug("Ice could not form because ice-form = false"); - event.setCancelled(true); - } + if (Tag.SNOW.isTagged(event.getNewState().getType())) { + if (!plot.getFlag(SnowFormFlag.class)) { + plot.debug("Snow could not form because snow-form = false"); + event.setCancelled(true); + } + return; + } + if (Tag.ICE.isTagged(event.getNewState().getType())) { + if (!plot.getFlag(IceFormFlag.class)) { + plot.debug("Ice could not form because ice-form = false"); + event.setCancelled(true); + } } } @@ -583,18 +573,12 @@ public class BlockEventListener implements Listener { return; } Class> flag; - switch (event.getNewState().getType()) { - case SNOW: - case SNOW_BLOCK: - flag = SnowFormFlag.class; - break; - case ICE: - case FROSTED_ICE: - case PACKED_ICE: - flag = IceFormFlag.class; - break; - default: - return; // other blocks are ignored by this event + if (Tag.SNOW.isTagged(event.getNewState().getType())) { + flag = SnowFormFlag.class; + } else if (Tag.ICE.isTagged(event.getNewState().getType())) { + flag = IceFormFlag.class; + } else { + return; } boolean allowed = plot.getFlag(flag); Entity entity = event.getEntity(); @@ -698,50 +682,33 @@ public class BlockEventListener implements Listener { event.setCancelled(true); return; } - switch (block.getType()) { - case ICE: - if (!plot.getFlag(IceMeltFlag.class)) { - plot.debug("Ice could not melt because ice-melt = false"); - event.setCancelled(true); - } - break; - case SNOW: - if (!plot.getFlag(SnowMeltFlag.class)) { - plot.debug("Snow could not melt because snow-melt = false"); - event.setCancelled(true); - } - break; - case FARMLAND: - if (!plot.getFlag(SoilDryFlag.class)) { - plot.debug("Soil could not dry because soil-dry = false"); - event.setCancelled(true); - } - break; - case TUBE_CORAL_BLOCK: - case BRAIN_CORAL_BLOCK: - case BUBBLE_CORAL_BLOCK: - case FIRE_CORAL_BLOCK: - case HORN_CORAL_BLOCK: - case TUBE_CORAL: - case BRAIN_CORAL: - case BUBBLE_CORAL: - case FIRE_CORAL: - case HORN_CORAL: - case TUBE_CORAL_FAN: - case BRAIN_CORAL_FAN: - case BUBBLE_CORAL_FAN: - case FIRE_CORAL_FAN: - case HORN_CORAL_FAN: - case BRAIN_CORAL_WALL_FAN: - case BUBBLE_CORAL_WALL_FAN: - case FIRE_CORAL_WALL_FAN: - case HORN_CORAL_WALL_FAN: - case TUBE_CORAL_WALL_FAN: - if (!plot.getFlag(CoralDryFlag.class)) { - plot.debug("Coral could not dry because coral-dry = false"); - event.setCancelled(true); - } - break; + Material blockType = block.getType(); + if (Tag.ICE.isTagged(blockType)) { + if (!plot.getFlag(IceMeltFlag.class)) { + plot.debug("Ice could not melt because ice-melt = false"); + event.setCancelled(true); + } + return; + } + if (Tag.SNOW.isTagged(blockType)) { + if (!plot.getFlag(SnowMeltFlag.class)) { + plot.debug("Snow could not melt because snow-melt = false"); + event.setCancelled(true); + } + return; + } + if (blockType == Material.FARMLAND) { + if (!plot.getFlag(SoilDryFlag.class)) { + plot.debug("Soil could not dry because soil-dry = false"); + event.setCancelled(true); + } + return; + } + if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType)) { + if (!plot.getFlag(CoralDryFlag.class)) { + plot.debug("Coral could not dry because coral-dry = false"); + event.setCancelled(true); + } } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java index a4e672959..ccefb86fa 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java @@ -26,6 +26,7 @@ import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag; import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag; +import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.Item; @@ -39,11 +40,31 @@ import org.bukkit.event.block.BlockReceiveGameEvent; import java.util.List; import java.util.Objects; +import java.util.Set; import java.util.UUID; @SuppressWarnings("unused") public class BlockEventListener117 implements Listener { + private static final Set COPPER_OXIDIZING = Set.of( + Material.COPPER_BLOCK, + Material.EXPOSED_COPPER, + Material.WEATHERED_COPPER, + Material.OXIDIZED_COPPER, + Material.CUT_COPPER, + Material.EXPOSED_CUT_COPPER, + Material.WEATHERED_CUT_COPPER, + Material.OXIDIZED_CUT_COPPER, + Material.CUT_COPPER_STAIRS, + Material.EXPOSED_CUT_COPPER_STAIRS, + Material.WEATHERED_CUT_COPPER_STAIRS, + Material.OXIDIZED_CUT_COPPER_STAIRS, + Material.CUT_COPPER_SLAB, + Material.EXPOSED_CUT_COPPER_SLAB, + Material.WEATHERED_CUT_COPPER_SLAB, + Material.OXIDIZED_CUT_COPPER_SLAB + ); + @Inject public BlockEventListener117() { } @@ -148,27 +169,11 @@ public class BlockEventListener117 implements Listener { if (plot == null) { return; } - switch (event.getNewState().getType()) { - case COPPER_BLOCK: - case EXPOSED_COPPER: - case WEATHERED_COPPER: - case OXIDIZED_COPPER: - case CUT_COPPER: - case EXPOSED_CUT_COPPER: - case WEATHERED_CUT_COPPER: - case OXIDIZED_CUT_COPPER: - case CUT_COPPER_STAIRS: - case EXPOSED_CUT_COPPER_STAIRS: - case WEATHERED_CUT_COPPER_STAIRS: - case OXIDIZED_CUT_COPPER_STAIRS: - case CUT_COPPER_SLAB: - case EXPOSED_CUT_COPPER_SLAB: - case WEATHERED_CUT_COPPER_SLAB: - case OXIDIZED_CUT_COPPER_SLAB: - if (!plot.getFlag(CopperOxideFlag.class)) { - plot.debug("Copper could not oxide because copper-oxide = false"); - event.setCancelled(true); - } + if (COPPER_OXIDIZING.contains(event.getNewState().getType())) { + if (!plot.getFlag(CopperOxideFlag.class)) { + plot.debug("Copper could not oxide because copper-oxide = false"); + event.setCancelled(true); + } } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java index 72dca3031..77d694379 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java @@ -124,17 +124,17 @@ public class EntitySpawnListener implements Listener { return; } Plot plot = location.getOwnedPlotAbs(); + EntityType type = entity.getType(); if (plot == null) { - EntityType type = entity.getType(); if (!area.isMobSpawning()) { - switch (type) { - case DROPPED_ITEM: - if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { - event.setCancelled(true); - return; - } - case PLAYER: - return; + if (type == EntityType.PLAYER) { + return; + } + if (type == EntityType.DROPPED_ITEM) { + if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { + event.setCancelled(true); + } + return; } if (type.isAlive()) { event.setCancelled(true); @@ -148,15 +148,16 @@ public class EntitySpawnListener implements Listener { if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { event.setCancelled(true); } - switch (entity.getType()) { - case ENDER_CRYSTAL: - if (BukkitEntityUtil.checkEntity(entity, plot)) { - event.setCancelled(true); - } - case SHULKER: - if (!entity.hasMetadata("shulkerPlot")) { - entity.setMetadata("shulkerPlot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot.getId())); - } + if (type == EntityType.ENDER_CRYSTAL) { + if (BukkitEntityUtil.checkEntity(entity, plot)) { + event.setCancelled(true); + } + return; + } + if (type == EntityType.SHULKER) { + if (!entity.hasMetadata("shulkerPlot")) { + entity.setMetadata("shulkerPlot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot.getId())); + } } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java index ea632ad7b..a2609fb23 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java @@ -230,15 +230,15 @@ public class PaperListener implements Listener { if (plot == null) { EntityType type = event.getType(); if (!area.isMobSpawning()) { - switch (type) { - case DROPPED_ITEM: - if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { - event.setShouldAbortSpawn(true); - event.setCancelled(true); - return; - } - case PLAYER: - return; + if (type == EntityType.PLAYER) { + return; + } + if (type == EntityType.DROPPED_ITEM) { + if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { + event.setShouldAbortSpawn(true); + event.setCancelled(true); + } + return; } if (type.isAlive()) { event.setShouldAbortSpawn(true); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java index 6199420d6..1a09da355 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java @@ -82,6 +82,7 @@ import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.FluidCollisionMode; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; @@ -159,6 +160,20 @@ import java.util.regex.Pattern; @SuppressWarnings("unused") public class PlayerEventListener extends PlotListener implements Listener { + private static final Set MINECARTS = Set.of( + Material.MINECART, + Material.TNT_MINECART, + Material.CHEST_MINECART, + Material.COMMAND_BLOCK_MINECART, + Material.FURNACE_MINECART, + Material.HOPPER_MINECART + ); + private static final Set BOOKS = Set.of( + Material.BOOK, + Material.KNOWLEDGE_BOOK, + Material.WRITABLE_BOOK, + Material.WRITTEN_BOOK + ); private final EventDispatcher eventDispatcher; private final WorldEdit worldEdit; private final PlotAreaManager plotAreaManager; @@ -830,10 +845,10 @@ public class PlayerEventListener extends PlotListener implements Listener { if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) { return; } - ItemStack current = inv.getItemInHand(); + ItemStack oldItem = inv.getItemInHand(); + ItemMeta oldMeta = oldItem.getItemMeta(); ItemStack newItem = event.getCursor(); ItemMeta newMeta = newItem.getItemMeta(); - ItemMeta oldMeta = newItem.getItemMeta(); if (event.getClick() == ClickType.CREATIVE) { final Plot plot = pp.getCurrentPlot(); @@ -873,34 +888,26 @@ public class PlayerEventListener extends PlotListener implements Listener { oldLore = lore.toString(); } } - if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) { - switch (newItem.getType()) { - case LEGACY_BANNER: - case PLAYER_HEAD: - if (newMeta != null) { - break; - } - default: - return; + Material itemType = newItem.getType(); + if (!"[(+NBT)]".equals(newLore) || (oldItem.equals(newItem) && newLore.equals(oldLore))) { + if (newMeta == null || (itemType != Material.LEGACY_BANNER && itemType != Material.PLAYER_HEAD)) { + return; } } Block block = player.getTargetBlock(null, 7); org.bukkit.block.BlockState state = block.getState(); Material stateType = state.getType(); - Material itemType = newItem.getType(); if (stateType != itemType) { - switch (stateType) { - case LEGACY_STANDING_BANNER: - case LEGACY_WALL_BANNER: - if (itemType == Material.LEGACY_BANNER) { - break; - } - case LEGACY_SKULL: - if (itemType == Material.LEGACY_SKULL_ITEM) { - break; - } - default: + if (stateType == Material.LEGACY_WALL_BANNER || stateType == Material.LEGACY_STANDING_BANNER) { + if (itemType != Material.LEGACY_BANNER) { return; + } + } else if (stateType == Material.LEGACY_SKULL) { + if (itemType != Material.LEGACY_SKULL_ITEM) { + return; + } + } else { + return; } } Location location = BukkitUtil.adapt(state.getLocation()); @@ -939,7 +946,7 @@ public class PlayerEventListener extends PlotListener implements Listener { } } if (cancelled) { - if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem + if ((oldItem.getType() == newItem.getType()) && (oldItem.getDurability() == newItem .getDurability())) { event.setCursor( new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability())); @@ -1126,14 +1133,21 @@ public class PlayerEventListener extends PlotListener implements Listener { //Allow all players to eat while also allowing the block place event ot be fired return; } - switch (type) { - case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART -> eventType = PlayerBlockEventType.PLACE_VEHICLE; - case FIREWORK_ROCKET, FIREWORK_STAR -> eventType = PlayerBlockEventType.SPAWN_MOB; - case BOOK, KNOWLEDGE_BOOK, WRITABLE_BOOK, WRITTEN_BOOK -> eventType = PlayerBlockEventType.READ; - case ARMOR_STAND -> { - location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation()); - eventType = PlayerBlockEventType.PLACE_MISC; - } + if (type == Material.ARMOR_STAND) { + location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation()); + eventType = PlayerBlockEventType.PLACE_MISC; + } + if (Tag.ITEMS_BOATS.isTagged(type) || MINECARTS.contains(type)) { + eventType = PlayerBlockEventType.PLACE_VEHICLE; + break; + } + if (type == Material.FIREWORK_ROCKET || type == Material.FIREWORK_STAR) { + eventType = PlayerBlockEventType.SPAWN_MOB; + break; + } + if (BOOKS.contains(type)) { + eventType = PlayerBlockEventType.READ; + break; } break; } From 9ac8d38bab6ccad8c5dbb7b3f3852b63ebb03ee5 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Mon, 20 Jun 2022 10:43:43 +0200 Subject: [PATCH 2/8] chore: Remove checkerframework from gradle libs Closes #3700 --- gradle/libs.versions.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a576c6b3d..f7328c9bc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,6 @@ [versions] # Platform expectations paper = "1.18.1-R0.1-SNAPSHOT" -checker-qual = "3.22.0" guice = "5.1.0" spotbugs = "4.7.0" @@ -29,7 +28,6 @@ nexus = "1.1.0" [libraries] # Platform expectations paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } -checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" } # Platform expectations guice = { group = "com.google.inject", name = "guice", version.ref = "guice" } From dda52ebc2e989cabba7977a6990f166e31dc3d40 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 10:47:49 +0200 Subject: [PATCH 3/8] build: Update dependency cloud.commandframework:cloud-services to v1.7.0 (#3701) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f7328c9bc..256a4d926 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ mvdwapi = "3.1.1" # Third party prtree = "2.0.0" aopalliance = "1.0" -cloud-services = "1.6.2" +cloud-services = "1.7.0" arkitektonika = "2.1.1" squirrelid = "0.3.1" http4j = "1.3" From f27009216c21a3bbe009f0c80c6b20c3e372277e Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Tue, 21 Jun 2022 19:09:17 +0200 Subject: [PATCH 4/8] chore: Replace AnnotationHelper class (#3706) --- Bukkit/build.gradle.kts | 2 + .../plotsquared/bukkit/queue/GenChunk.java | 4 +- Core/build.gradle.kts | 2 + .../com/plotsquared/core/PlotPlatform.java | 4 +- .../core/generator/HybridPlotWorld.java | 8 +-- .../core/location/UncheckedWorldLocation.java | 8 +-- .../core/plot/flag/FlagContainer.java | 5 +- ...BlockArrayCacheScopedQueueCoordinator.java | 4 +- .../core/util/AnnotationHelper.java | 55 ------------------- .../core/util/EventDispatcher.java | 4 +- build.gradle.kts | 2 +- 11 files changed, 23 insertions(+), 75 deletions(-) delete mode 100644 Core/src/main/java/com/plotsquared/core/util/AnnotationHelper.java diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index f29140b42..958f4627a 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -50,6 +50,7 @@ dependencies { implementation(libs.arkitektonika) implementation(libs.http4j) implementation("com.intellectualsites.paster:Paster") + implementation("com.intellectualsites.informative-annotations:informative-annotations") // Adventure implementation("net.kyori:adventure-platform-bukkit") @@ -87,6 +88,7 @@ tasks.named("shadowJar") { relocate("javax.inject", "com.plotsquared.core.annotation.inject") relocate("net.jcip", "com.plotsquared.core.annotations.jcip") relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs") + relocate("com.intellectualsites.informative-annotations", "com.plotsquared.core.annotation.informative") // Get rid of all the libs which are 100% unused. minimize() diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java index 0b580cf48..44ec39545 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java @@ -19,12 +19,12 @@ package com.plotsquared.bukkit.queue; import com.google.common.base.Preconditions; +import com.intellectualsites.annotations.DoNotUse; import com.plotsquared.bukkit.util.BukkitBlockUtil; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.location.ChunkWrapper; import com.plotsquared.core.location.Location; import com.plotsquared.core.queue.ScopedQueueCoordinator; -import com.plotsquared.core.util.AnnotationHelper; import com.plotsquared.core.util.ChunkUtil; import com.plotsquared.core.util.PatternUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; @@ -44,7 +44,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; import java.util.Arrays; -@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") +@DoNotUse public class GenChunk extends ScopedQueueCoordinator { public final Biome[] biomes; diff --git a/Core/build.gradle.kts b/Core/build.gradle.kts index a9a7f02b1..284b5399b 100644 --- a/Core/build.gradle.kts +++ b/Core/build.gradle.kts @@ -43,6 +43,7 @@ dependencies { api(libs.cloudServices) api(libs.arkitektonika) api("com.intellectualsites.paster:Paster") + api("com.intellectualsites.informative-annotations:informative-annotations") } tasks.processResources { @@ -62,5 +63,6 @@ tasks { opt.links("https://jd.adventure.kyori.net/api/4.9.3/") opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/") opt.links("https://checkerframework.org/api/") + opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/") } } diff --git a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java index b107724a5..75ceef94d 100644 --- a/Core/src/main/java/com/plotsquared/core/PlotPlatform.java +++ b/Core/src/main/java/com/plotsquared/core/PlotPlatform.java @@ -22,6 +22,7 @@ import cloud.commandframework.services.ServicePipeline; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.TypeLiteral; +import com.intellectualsites.annotations.DoNotUse; import com.plotsquared.core.backup.BackupManager; import com.plotsquared.core.configuration.caption.LocaleHolder; import com.plotsquared.core.generator.GeneratorWrapper; @@ -33,7 +34,6 @@ import com.plotsquared.core.permissions.PermissionHandler; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.queue.GlobalBlockQueue; -import com.plotsquared.core.util.AnnotationHelper; import com.plotsquared.core.util.ChunkManager; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.PlatformWorldManager; @@ -308,7 +308,7 @@ public interface PlotPlatform

extends LocaleHolder { * @return worldedit implementations * @since 6.3.0 */ - @AnnotationHelper.ApiDescription(info = "Internal use only") + @DoNotUse @NonNull String worldEditImplementations(); /** diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java index 3c5b8686c..054410817 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java @@ -20,6 +20,7 @@ package com.plotsquared.core.generator; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import com.intellectualsites.annotations.DoNotUse; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.Settings; @@ -33,7 +34,6 @@ import com.plotsquared.core.plot.PlotId; import com.plotsquared.core.plot.PlotManager; import com.plotsquared.core.plot.schematic.Schematic; import com.plotsquared.core.queue.GlobalBlockQueue; -import com.plotsquared.core.util.AnnotationHelper; import com.plotsquared.core.util.FileUtils; import com.plotsquared.core.util.MathMan; import com.plotsquared.core.util.SchematicHandler; @@ -531,7 +531,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { * * @since 6.9.0 */ - @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") + @DoNotUse public @Nullable List getPlotSchematicEntities() { return schem3Entities; } @@ -541,7 +541,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { * * @since 6.9.0 */ - @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") + @DoNotUse public @Nullable BlockVector3 getPlotSchematicMinPoint() { return schem3MinPoint; } @@ -551,7 +551,7 @@ public class HybridPlotWorld extends ClassicPlotWorld { * * @since 6.9.0 */ - @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") + @DoNotUse public boolean populationNeeded() { return schem1PopulationNeeded || schem2PopulationNeeded || schem3PopulationNeeded; } diff --git a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java b/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java index baa0c5086..bdf58ef5d 100644 --- a/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java +++ b/Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java @@ -18,7 +18,7 @@ */ package com.plotsquared.core.location; -import com.plotsquared.core.util.AnnotationHelper; +import com.intellectualsites.annotations.DoNotUse; import com.sk89q.worldedit.math.BlockVector3; import org.checkerframework.checker.nullness.qual.NonNull; @@ -28,7 +28,7 @@ import org.checkerframework.checker.nullness.qual.NonNull; * * @since 6.9.0 */ -@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") +@DoNotUse public final class UncheckedWorldLocation extends Location { private final String worldName; @@ -54,7 +54,7 @@ public final class UncheckedWorldLocation extends Location { * * @since 6.9.0 */ - @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") + @DoNotUse public static @NonNull UncheckedWorldLocation at( final @NonNull String world, final int x, final int y, final int z ) { @@ -62,7 +62,7 @@ public final class UncheckedWorldLocation extends Location { } @Override - @AnnotationHelper.ApiDescription(info = "Internal use only. Subject to changes at any time.") + @DoNotUse public @NonNull String getWorldName() { return this.worldName; } diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java index 265f5f2c8..37fda5dd2 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/FlagContainer.java @@ -20,8 +20,8 @@ package com.plotsquared.core.plot.flag; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +import com.intellectualsites.annotations.NotPublic; import com.plotsquared.core.configuration.caption.CaptionUtility; -import com.plotsquared.core.util.AnnotationHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.checkerframework.checker.nullness.qual.NonNull; @@ -32,7 +32,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Locale; import java.util.Map; -import java.util.Objects; /** * Container type for {@link PlotFlag plot flags}. @@ -353,7 +352,7 @@ public class FlagContainer { * @return a new Runnable that cleans up once the FlagContainer isn't needed anymore. * @since 6.0.10 */ - @AnnotationHelper.ApiDescription(info = "This method should not be considered as public or API.") + @NotPublic public Runnable createCleanupHook() { return () -> GlobalFlagContainer.getInstance().unsubscribe(unknownsRef); } diff --git a/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java b/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java index a57f2c389..243f5637f 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java +++ b/Core/src/main/java/com/plotsquared/core/queue/BlockArrayCacheScopedQueueCoordinator.java @@ -18,8 +18,8 @@ */ package com.plotsquared.core.queue; +import com.intellectualsites.annotations.DoNotUse; import com.plotsquared.core.location.Location; -import com.plotsquared.core.util.AnnotationHelper; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector3; @@ -37,7 +37,7 @@ import org.checkerframework.checker.nullness.qual.Nullable; * in {@link BlockArrayCacheScopedQueueCoordinator#setOffsetX(int)} and * {@link BlockArrayCacheScopedQueueCoordinator#setOffsetZ(int)} */ -@AnnotationHelper.ApiDescription(info = "Internal use only. Subject to change at any time and created for specific use cases.") +@DoNotUse public class BlockArrayCacheScopedQueueCoordinator extends ScopedQueueCoordinator { private final BlockState[][][] blockStates; diff --git a/Core/src/main/java/com/plotsquared/core/util/AnnotationHelper.java b/Core/src/main/java/com/plotsquared/core/util/AnnotationHelper.java deleted file mode 100644 index bb8d69664..000000000 --- a/Core/src/main/java/com/plotsquared/core/util/AnnotationHelper.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * PlotSquared, a land and world management plugin for Minecraft. - * Copyright (C) IntellectualSites - * Copyright (C) IntellectualSites team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.plotsquared.core.util; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.MODULE; -import static java.lang.annotation.ElementType.PACKAGE; -import static java.lang.annotation.ElementType.RECORD_COMPONENT; -import static java.lang.annotation.ElementType.TYPE; - -/** - * @since 6.2.2 - */ -@AnnotationHelper.ApiDescription(info = "An internal class for custom annotations." + - "This is in no form part of the API and is subject to change at any time.") -public final class AnnotationHelper { - - private AnnotationHelper() { - } - - @Documented - @Retention(RetentionPolicy.CLASS) - @Target(value = {METHOD, PACKAGE, MODULE, RECORD_COMPONENT, TYPE}) - public @interface ApiDescription { - /** - * Returns additional information how to use a class for the API - * - * @return the version string - * @since 6.2.2 - */ - String info() default ""; - } - -} diff --git a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java index 7285e1981..d1ad9386c 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java @@ -19,6 +19,7 @@ package com.plotsquared.core.util; import com.google.common.eventbus.EventBus; +import com.intellectualsites.annotations.DoNotUse; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.events.PlayerAutoPlotEvent; @@ -81,8 +82,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -@AnnotationHelper.ApiDescription(info = "This is an internal class used by PlotSquared to dispatch events." + - "This is in no form part of the API and is subject to change at any time.") +@DoNotUse public class EventDispatcher { private final EventBus eventBus = new EventBus("PlotSquaredEvents"); diff --git a/build.gradle.kts b/build.gradle.kts index 9aa40c8bc..7f9d801ae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,7 +65,7 @@ subprojects { } dependencies { - implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.5")) + implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.7")) } dependencies { From f218902581d049a7693f9cfc17d5364e0817234d Mon Sep 17 00:00:00 2001 From: Jordan Date: Tue, 21 Jun 2022 18:09:29 +0100 Subject: [PATCH 5/8] Implement build height limits into more events (#3691) * Implement build height limits into more events * Implement util method to check if y is within world build limits * Extract duplicate player-build-height-checking to plot area - Extract to core module to allow any possible future platforms to access the method, as they will always duplicate * Add code tag to javadoc Co-authored-by: Alexander Brandes Co-authored-by: Alexander Brandes --- .../bukkit/listener/BlockEventListener.java | 88 ++++++++++--------- .../listener/BlockEventListener117.java | 41 ++++----- .../bukkit/listener/PlayerEventListener.java | 7 +- .../com/plotsquared/core/plot/PlotArea.java | 34 +++++++ .../core/util/EventDispatcher.java | 9 ++ 5 files changed, 114 insertions(+), 65 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java index 06c1f3e66..198710578 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java @@ -265,15 +265,9 @@ public class BlockEventListener implements Listener { BukkitPlayer pp = BukkitUtil.adapt(player); Plot plot = area.getPlot(location); if (plot != null) { - if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area - .getMinBuildHeight()) && !Permissions - .hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + if (area.notifyIfOutsideBuildArea(pp, location.getY())) { event.setCancelled(true); - pp.sendMessage( - TranslatableCaption.of("height.height_limit"), - Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), - Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight())) - ); + return; } if (!plot.hasOwner()) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_UNOWNED)) { @@ -351,15 +345,9 @@ public class BlockEventListener implements Listener { event.setCancelled(true); return; } - } else if ((location.getY() >= area.getMaxBuildHeight() || location.getY() < area - .getMinBuildHeight()) && !Permissions - .hasPermission(plotPlayer, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + } else if (area.notifyIfOutsideBuildArea(plotPlayer, location.getY())) { event.setCancelled(true); - plotPlayer.sendMessage( - TranslatableCaption.of("height.height_limit"), - Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), - Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight())) - ); + return; } if (!plot.hasOwner()) { if (!Permissions @@ -537,7 +525,7 @@ public class BlockEventListener implements Listener { if (plot == null) { return; } - if (location.getY() >= area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) { + if (!area.buildRangeContainsY(location.getY())) { event.setCancelled(true); return; } @@ -739,7 +727,7 @@ public class BlockEventListener implements Listener { } return; } - if (toLocation.getY() >= toArea.getMaxBuildHeight() || toLocation.getY() < toArea.getMinBuildHeight()) { + if (!toArea.buildRangeContainsY(toLocation.getY())) { event.setCancelled(true); return; } @@ -813,6 +801,11 @@ public class BlockEventListener implements Listener { return; } + if (!area.buildRangeContainsY(location.getY())) { + event.setCancelled(true); + return; + } + Plot plot = location.getOwnedPlot(); if (plot == null || !plot.getFlag(CropGrowFlag.class)) { if (plot != null) { @@ -856,15 +849,16 @@ public class BlockEventListener implements Listener { } for (Block block1 : event.getBlocks()) { Location bloc = BukkitUtil.adapt(block1.getLocation()); - if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains( - bloc.getX() + relative.getBlockX(), - bloc.getZ() + relative.getBlockZ() - )) { + Location newLoc = bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ()); + if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains(newLoc)) { event.setCancelled(true); return; } - if (!plot.equals(area.getOwnedPlot(bloc)) || !plot - .equals(area.getOwnedPlot(bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) { + if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(newLoc))) { + event.setCancelled(true); + return; + } + if (!area.buildRangeContainsY(bloc.getY()) || !area.buildRangeContainsY(newLoc.getY())) { event.setCancelled(true); return; } @@ -890,9 +884,8 @@ public class BlockEventListener implements Listener { } for (Block block1 : event.getBlocks()) { Location bloc = BukkitUtil.adapt(block1.getLocation()); - if (bloc.isPlotArea() || bloc - .add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ()) - .isPlotArea()) { + Location newLoc = bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ()); + if (bloc.isPlotArea() || newLoc.isPlotArea()) { event.setCancelled(true); return; } @@ -906,15 +899,16 @@ public class BlockEventListener implements Listener { } for (Block block1 : event.getBlocks()) { Location bloc = BukkitUtil.adapt(block1.getLocation()); - if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains( - bloc.getX() + relative.getBlockX(), - bloc.getZ() + relative.getBlockZ() - )) { + Location newLoc = bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ()); + if (!area.contains(bloc.getX(), bloc.getZ()) || !area.contains(newLoc)) { event.setCancelled(true); return; } - if (!plot.equals(area.getOwnedPlot(bloc)) || !plot - .equals(area.getOwnedPlot(bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) { + if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(newLoc))) { + event.setCancelled(true); + return; + } + if (!area.buildRangeContainsY(bloc.getY()) || !area.buildRangeContainsY(newLoc.getY())) { event.setCancelled(true); return; } @@ -938,6 +932,11 @@ public class BlockEventListener implements Listener { Location location = BukkitUtil.adapt(event.getBlock().getRelative(targetFace).getLocation()); if (location.isPlotRoad()) { event.setCancelled(true); + return; + } + PlotArea area = location.getPlotArea(); + if (area != null && !area.buildRangeContainsY(location.getY())) { + event.setCancelled(true); } } } @@ -977,6 +976,10 @@ public class BlockEventListener implements Listener { Plot plot = area.getOwnedPlot(location); if (!Objects.equals(plot, origin)) { event.getBlocks().remove(i); + continue; + } + if (!area.buildRangeContainsY(location.getY())) { + event.getBlocks().remove(i); } } } @@ -1068,6 +1071,10 @@ public class BlockEventListener implements Listener { Plot plot = area.getOwnedPlot(location1); if (player != null) { BukkitPlayer pp = BukkitUtil.adapt(player); + if (area.notifyIfOutsideBuildArea(pp, location1.getY())) { + event.setCancelled(true); + return; + } if (plot == null) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_ROAD)) { pp.sendMessage( @@ -1175,7 +1182,10 @@ public class BlockEventListener implements Listener { return true; } Plot plot = area.getOwnedPlot(blockLocation); - return !Objects.equals(plot, origin); + if (!Objects.equals(plot, origin)) { + return true; + } + return !area.buildRangeContainsY(location.getY()); }); } if (blocks.isEmpty()) { @@ -1217,15 +1227,7 @@ public class BlockEventListener implements Listener { event.setCancelled(true); break; } - if (Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { - continue; - } - if (currentLocation.getY() >= area.getMaxBuildHeight() || currentLocation.getY() < area.getMinBuildHeight()) { - pp.sendMessage( - TranslatableCaption.of("height.height_limit"), - Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), - Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight())) - ); + if (area.notifyIfOutsideBuildArea(pp, currentLocation.getY())) { event.setCancelled(true); break; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java index ccefb86fa..2d23515ad 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener117.java @@ -80,10 +80,19 @@ public class BlockEventListener117 implements Listener { return; } + BukkitPlayer plotPlayer = null; + + if (entity instanceof Player player) { + plotPlayer = BukkitUtil.adapt(player); + if (area.notifyIfOutsideBuildArea(plotPlayer, location.getY())) { + event.setCancelled(true); + return; + } + } + Plot plot = location.getOwnedPlot(); if (plot == null || !plot.getFlag(MiscInteractFlag.class)) { - if (entity instanceof Player player) { - BukkitPlayer plotPlayer = BukkitUtil.adapt(player); + if (plotPlayer != null) { if (plot != null) { if (!plot.isAdded(plotPlayer.getUUID())) { plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because misc-interact = false"); @@ -115,12 +124,12 @@ public class BlockEventListener117 implements Listener { PlotArea area = location.getPlotArea(); if (area == null) { for (int i = blocks.size() - 1; i >= 0; i--) { - location = BukkitUtil.adapt(blocks.get(i).getLocation()); - if (location.isPlotArea()) { + Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation()); + blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation()); + if (blockLocation.isPlotArea()) { blocks.remove(i); } } - return; } else { Plot origin = area.getOwnedPlot(location); if (origin == null) { @@ -128,27 +137,19 @@ public class BlockEventListener117 implements Listener { return; } for (int i = blocks.size() - 1; i >= 0; i--) { - location = BukkitUtil.adapt(blocks.get(i).getLocation()); - if (!area.contains(location.getX(), location.getZ())) { + Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation()); + if (!area.contains(blockLocation.getX(), blockLocation.getZ())) { blocks.remove(i); continue; } - Plot plot = area.getOwnedPlot(location); + Plot plot = area.getOwnedPlot(blockLocation); if (!Objects.equals(plot, origin)) { event.getBlocks().remove(i); + continue; + } + if (!area.buildRangeContainsY(location.getY())) { + event.getBlocks().remove(i); } - } - } - Plot origin = area.getPlot(location); - if (origin == null) { - event.setCancelled(true); - return; - } - for (int i = blocks.size() - 1; i >= 0; i--) { - location = BukkitUtil.adapt(blocks.get(i).getLocation()); - Plot plot = area.getOwnedPlot(location); - if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) { - event.getBlocks().remove(i); } } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java index 1a09da355..842fbd66d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java @@ -146,13 +146,11 @@ import org.bukkit.util.Vector; import org.checkerframework.checker.nullness.qual.NonNull; import java.lang.reflect.Field; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Set; import java.util.UUID; -import java.util.regex.Pattern; /** * Player Events involving plots. @@ -1719,6 +1717,7 @@ public class PlayerEventListener extends PlotListener implements Listener { if (PlotSquared.get().getPlotAreaManager().getPlotAreasSet(world).size() == 0) { return; } + BukkitPlayer pp = (event.getEntity() instanceof Player player) ? BukkitUtil.adapt(player) : null; int minX = Integer.MAX_VALUE; int maxX = Integer.MIN_VALUE; int minZ = Integer.MAX_VALUE; @@ -1740,6 +1739,10 @@ public class PlayerEventListener extends PlotListener implements Listener { if (area == null) { continue; } + if (area.notifyIfOutsideBuildArea(pp, location.getY())) { + event.setCancelled(true); + return; + } Plot plot = location.getOwnedPlot(); if (plot == null) { if (area.isRoadFlags() && area.getRoadFlag(DenyPortalsFlag.class)) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index fb42e9881..352614832 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -36,6 +36,7 @@ import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.Direction; import com.plotsquared.core.location.Location; import com.plotsquared.core.location.PlotLoc; +import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.ConsolePlayer; import com.plotsquared.core.player.MetaDataAccess; import com.plotsquared.core.player.PlayerMetaDataKeys; @@ -48,6 +49,7 @@ import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.queue.GlobalBlockQueue; import com.plotsquared.core.queue.QueueCoordinator; import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.PlotExpression; import com.plotsquared.core.util.RegionUtil; import com.plotsquared.core.util.StringMan; @@ -624,6 +626,38 @@ public abstract class PlotArea { getRegionAbs() == null || this.region.contains(location.getBlockVector3())); } + /** + * Get if the {@code PlotArea}'s build range (min build height -> max build height) contains the given y value + * + * @param y y height + * @return if build height contains y + */ + public boolean buildRangeContainsY(int y) { + return y >= minBuildHeight && y < maxBuildHeight; + } + + /** + * Utility method to check if the player is attempting to place blocks outside the build area, and notify of this if the + * player does not have permissions. + * + * @param player Player to check + * @param y y height to check + * @return true if outside build area with no permissions + * @since TODO + */ + public boolean notifyIfOutsideBuildArea(PlotPlayer player, int y) { + if (!buildRangeContainsY(y) && !Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + player.sendMessage( + TranslatableCaption.of("height.height_limit"), + Template.of("minHeight", String.valueOf(minBuildHeight)), + Template.of("maxHeight", String.valueOf(maxBuildHeight)) + ); + // Return true if "failed" as the method will always be inverted otherwise + return true; + } + return false; + } + public @NonNull Set getPlotsAbs(final UUID uuid) { if (uuid == null) { return Collections.emptySet(); diff --git a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java index d1ad9386c..e91c7b35b 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java @@ -332,6 +332,15 @@ public class EventDispatcher { ) { PlotArea area = location.getPlotArea(); assert area != null; + if (!area.buildRangeContainsY(location.getY()) && !Permissions + .hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + player.sendMessage( + TranslatableCaption.of("height.height_limit"), + Template.of("minHeight", String.valueOf(area.getMinBuildHeight())), + Template.of("maxHeight", String.valueOf(area.getMaxBuildHeight())) + ); + return false; + } Plot plot = area.getPlot(location); if (plot != null) { if (plot.isAdded(player.getUUID())) { From 312cb2996c6551247f992ee6c9d12257af8edaa6 Mon Sep 17 00:00:00 2001 From: Traks <58818927+traksag@users.noreply.github.com> Date: Wed, 22 Jun 2022 13:50:46 +0200 Subject: [PATCH 6/8] Better handling of offline projectile shooters (#3705) --- .../bukkit/listener/ProjectileEventListener.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java index 4293038df..2f37df132 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java @@ -149,6 +149,18 @@ public class ProjectileEventListener implements Listener { Plot plot = area.getPlot(location); ProjectileSource shooter = entity.getShooter(); if (shooter instanceof Player) { + if (!((Player) shooter).isOnline()) { + if (plot != null) { + if (plot.isAdded(((Player) shooter).getUniqueId()) || plot.getFlag(ProjectilesFlag.class)) { + return; + } + } + + entity.remove(); + event.setCancelled(true); + return; + } + PlotPlayer pp = BukkitUtil.adapt((Player) shooter); if (plot == null) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) { From c09d0d882ee075872c98c13b04db57abf4e442f5 Mon Sep 17 00:00:00 2001 From: Traks <58818927+traksag@users.noreply.github.com> Date: Wed, 22 Jun 2022 13:50:56 +0200 Subject: [PATCH 7/8] Use single PlotListener instance (#3704) --- .../bukkit/listener/PlayerEventListener.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java index 842fbd66d..6eddc83e1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java @@ -156,7 +156,7 @@ import java.util.UUID; * Player Events involving plots. */ @SuppressWarnings("unused") -public class PlayerEventListener extends PlotListener implements Listener { +public class PlayerEventListener implements Listener { private static final Set MINECARTS = Set.of( Material.MINECART, @@ -175,6 +175,7 @@ public class PlayerEventListener extends PlotListener implements Listener { private final EventDispatcher eventDispatcher; private final WorldEdit worldEdit; private final PlotAreaManager plotAreaManager; + private final PlotListener plotListener; // To prevent recursion private boolean tmpTeleport = true; private Field fieldPlayer; @@ -194,12 +195,13 @@ public class PlayerEventListener extends PlotListener implements Listener { public PlayerEventListener( final @NonNull PlotAreaManager plotAreaManager, final @NonNull EventDispatcher eventDispatcher, - final @NonNull WorldEdit worldEdit + final @NonNull WorldEdit worldEdit, + final @NonNull PlotListener plotListener ) { - super(eventDispatcher); this.eventDispatcher = eventDispatcher; this.worldEdit = worldEdit; this.plotAreaManager = plotAreaManager; + this.plotListener = plotListener; } @EventHandler @@ -352,7 +354,7 @@ public class PlayerEventListener extends PlotListener implements Listener { if (area != null) { Plot plot = area.getPlot(location); if (plot != null) { - plotEntry(pp, plot); + plotListener.plotEntry(pp, plot); } } // Delayed @@ -404,7 +406,7 @@ public class PlayerEventListener extends PlotListener implements Listener { PlotArea area = location.getPlotArea(); if (area == null) { if (lastPlot != null) { - plotExit(pp, lastPlot); + plotListener.plotExit(pp, lastPlot); lastPlotAccess.remove(); } try (final MetaDataAccess lastLocationAccess = @@ -538,7 +540,7 @@ public class PlayerEventListener extends PlotListener implements Listener { if (now == null) { try (final MetaDataAccess kickAccess = pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) { - if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { + if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED)) @@ -556,7 +558,7 @@ public class PlayerEventListener extends PlotListener implements Listener { } } else if (now.equals(lastPlot)) { ForceFieldListener.handleForcefield(player, pp, now); - } else if (!plotEntry(pp, now) && this.tmpTeleport) { + } else if (!plotListener.plotEntry(pp, now) && this.tmpTeleport) { pp.sendMessage( TranslatableCaption.of("deny.no_enter"), Template.of("plot", now.toString()) @@ -628,7 +630,7 @@ public class PlayerEventListener extends PlotListener implements Listener { if (plot == null) { try (final MetaDataAccess kickAccess = pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) { - if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { + if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(false)) { pp.sendMessage( TranslatableCaption.of("permission.no_permission_event"), Template.of("node", String.valueOf(Permission.PERMISSION_ADMIN_EXIT_DENIED)) @@ -646,7 +648,7 @@ public class PlayerEventListener extends PlotListener implements Listener { } } else if (plot.equals(lastPlot)) { ForceFieldListener.handleForcefield(player, pp, plot); - } else if (!plotEntry(pp, plot) && this.tmpTeleport) { + } else if (!plotListener.plotEntry(pp, plot) && this.tmpTeleport) { pp.sendMessage( TranslatableCaption.of("deny.no_enter"), Template.of("plot", plot.toString()) @@ -793,7 +795,7 @@ public class PlayerEventListener extends PlotListener implements Listener { lastLocationAccess.remove(); } if (plot != null) { - plotExit(pp, plot); + plotListener.plotExit(pp, plot); } if (this.worldEdit != null) { if (!Permissions.hasPermission(pp, Permission.PERMISSION_WORLDEDIT_BYPASS)) { @@ -807,7 +809,7 @@ public class PlayerEventListener extends PlotListener implements Listener { if (location.isPlotArea()) { plot = location.getPlot(); if (plot != null) { - plotEntry(pp, plot); + plotListener.plotEntry(pp, plot); } } } @@ -1280,7 +1282,7 @@ public class PlayerEventListener extends PlotListener implements Listener { TaskManager.removeFromTeleportQueue(event.getPlayer().getName()); BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer()); pp.unregister(); - this.logout(pp.getUUID()); + plotListener.logout(pp.getUUID()); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) From f4b886d977d56940aab57a1a4258917becf7fe68 Mon Sep 17 00:00:00 2001 From: Jordan Date: Thu, 23 Jun 2022 18:18:29 +0100 Subject: [PATCH 8/8] Minor cleanup of the plot analyze code (#3708) - No need to wrap the final analysis into another async method. It's already contained in an async task - Don't overstretch a chunk bounday when setting blocks to newBlocks array --- .../java/com/plotsquared/core/generator/HybridUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java index fcfbe1bf8..cc00345bd 100644 --- a/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java +++ b/Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java @@ -189,13 +189,13 @@ public class HybridUtils { if (X == ctx) { maxX = tx & 15; } else { - maxX = 16; + maxX = 15; } int maxZ; if (Z == ctz) { maxZ = tz & 15; } else { - maxZ = 16; + maxZ = 15; } int chunkBlockX = X << 4; @@ -221,7 +221,7 @@ public class HybridUtils { } }); - final Runnable run = () -> TaskManager.runTaskAsync(() -> { + final Runnable run = () -> { int size = width * length; int[] changes = new int[size]; int[] faces = new int[size]; @@ -296,7 +296,7 @@ public class HybridUtils { analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety) * 100); whenDone.value = analysis; whenDone.run(); - }); + }; queue.setCompleteTask(run); queue.enqueue(); });