From 5e628cc7584438f402a2bde66378365714e6753c Mon Sep 17 00:00:00 2001 From: RedstoneFuture Date: Fri, 1 Nov 2024 12:06:46 +0100 Subject: [PATCH] Restriction: Adding "weaving-death-place" flag (#4519) * Adding "weaving-death-place" flag * Improving spelling of flag description * Reworking event listener for Weaving effect * Undoing import optimization * Fixing weaving-death-place check for plots --- .../bukkit/listener/EntityEventListener.java | 24 ++++++++++++ .../core/plot/flag/GlobalFlagContainer.java | 2 + .../implementations/WeavingDeathPlace.java | 39 +++++++++++++++++++ Core/src/main/resources/lang/messages_en.json | 1 + 4 files changed, 66 insertions(+) create mode 100644 Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeavingDeathPlace.java diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java index a2a5f1699..358c348dd 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java @@ -37,6 +37,7 @@ import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag; import com.plotsquared.core.plot.flag.implementations.ExplosionFlag; import com.plotsquared.core.plot.flag.implementations.InvincibleFlag; import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag; +import com.plotsquared.core.plot.flag.implementations.WeavingDeathPlace; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.PlotFlagUtil; @@ -243,6 +244,29 @@ public class EntityEventListener implements Listener { } } + @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) + public void onWeavingEffect(EntityChangeBlockEvent event) { + if (event.getTo() != Material.COBWEB) { + return; + } + Location location = BukkitUtil.adapt(event.getBlock().getLocation()); + PlotArea area = location.getPlotArea(); + if (area == null) { + return; + } + Plot plot = location.getOwnedPlot(); + if (plot == null) { + if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, WeavingDeathPlace.class, false)) { + event.setCancelled(true); + } + return; + } + if (!plot.getFlag(WeavingDeathPlace.class)) { + plot.debug(event.getTo() + " could not spawn because weaving-death-place = false"); + event.setCancelled(true); + } + } + @EventHandler(priority = EventPriority.HIGH) public void onDamage(EntityDamageEvent event) { if (event.getEntityType() != EntityType.PLAYER) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java b/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java index bff2b0c8b..3e704a021 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java @@ -92,6 +92,7 @@ import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag; import com.plotsquared.core.plot.flag.implementations.PriceFlag; import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag; import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; +import com.plotsquared.core.plot.flag.implementations.WeavingDeathPlace; import com.plotsquared.core.plot.flag.implementations.PveFlag; import com.plotsquared.core.plot.flag.implementations.PvpFlag; import com.plotsquared.core.plot.flag.implementations.RedstoneFlag; @@ -207,6 +208,7 @@ public final class GlobalFlagContainer extends FlagContainer { this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE); this.addFlag(VineGrowFlag.VINE_GROW_TRUE); this.addFlag(ProjectilesFlag.PROJECTILES_FALSE); + this.addFlag(WeavingDeathPlace.WEAVING_DEATH_PLACE_FALSE); // Double flags this.addFlag(PriceFlag.PRICE_NOT_BUYABLE); diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeavingDeathPlace.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeavingDeathPlace.java new file mode 100644 index 000000000..3eb489c31 --- /dev/null +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeavingDeathPlace.java @@ -0,0 +1,39 @@ +/* + * 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.plot.flag.implementations; + +import com.plotsquared.core.configuration.caption.TranslatableCaption; +import com.plotsquared.core.plot.flag.types.BooleanFlag; +import org.checkerframework.checker.nullness.qual.NonNull; + +public class WeavingDeathPlace extends BooleanFlag { + + public static final WeavingDeathPlace WEAVING_DEATH_PLACE_TRUE = new WeavingDeathPlace(true); + public static final WeavingDeathPlace WEAVING_DEATH_PLACE_FALSE = new WeavingDeathPlace(false); + + private WeavingDeathPlace(boolean value) { + super(value, TranslatableCaption.of("flags.flag_description_weaving_death_place")); + } + + @Override + protected WeavingDeathPlace flagOf(@NonNull Boolean value) { + return value ? WEAVING_DEATH_PLACE_TRUE : WEAVING_DEATH_PLACE_FALSE; + } + +} diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json index 5ea33d6a6..53e42cbad 100644 --- a/Core/src/main/resources/lang/messages_en.json +++ b/Core/src/main/resources/lang/messages_en.json @@ -628,6 +628,7 @@ "flags.flag_description_prevent_creative_copy": "Prevents people from copying item NBT data in the plot unless they're added as members.", "flags.flag_description_leaf_decay": "Set to `false` to prevent leaves from decaying.", "flags.flag_description_projectiles": "Prevents guests from shooting projectiles on the plot when set to false.", + "flags.flag_description_weaving_death_place": "Set to `false` to prevent spawning of cobwebs by the Weaving status effect on the death of an entity.", "flags.flag_description_beacon_effect": "Enables beacon effects on the plot.", "flags.flag_error_boolean": "Flag value must be a boolean (true | false).", "flags.flag_error_enum": "Must be one of: ",