Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: disable sign-coloring when edit-sign flag is false #4252

Merged
merged 6 commits into from
Dec 6, 2023
Merged

Fix: disable sign-coloring when edit-sign flag is false #4252

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a829ba0
Initial commit
Dec 1, 2023
455936b
Update Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEve…
Dec 1, 2023
91ac0ba
Merge branch 'IntellectualSites:main' into fix/sign-coloring
Dec 2, 2023
8841c3d
Relocated Item check
Dec 3, 2023
75f3d3a
Added version check when building list of items
Dec 3, 2023
22a09f4
Use mutable set and copy to immutable
Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
Expand Down Expand Up @@ -87,6 +88,7 @@
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
import org.bukkit.block.Sign;
import org.bukkit.block.data.Waterlogged;
import org.bukkit.command.PluginCommand;
import org.bukkit.entity.ArmorStand;
Expand Down Expand Up @@ -175,6 +177,26 @@ public class PlayerEventListener implements Listener {
Material.WRITABLE_BOOK,
Material.WRITTEN_BOOK
);
private static final Set<Material> DYES = Set.of(
Material.WHITE_DYE,
Material.LIGHT_GRAY_DYE,
Material.GRAY_DYE,
Material.BLACK_DYE,
Material.BROWN_DYE,
Material.RED_DYE,
Material.ORANGE_DYE,
Material.YELLOW_DYE,
Material.LIME_DYE,
Material.GREEN_DYE,
Material.CYAN_DYE,
Material.LIGHT_BLUE_DYE,
Material.BLUE_DYE,
Material.PURPLE_DYE,
Material.MAGENTA_DYE,
Material.PINK_DYE,
Material.GLOW_INK_SAC,
Material.HONEYCOMB
);
private final EventDispatcher eventDispatcher;
private final WorldEdit worldEdit;
private final PlotAreaManager plotAreaManager;
Expand Down Expand Up @@ -207,6 +229,38 @@ public PlayerEventListener(
this.plotListener = plotListener;
}

@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerDyeSign(PlayerInteractEvent event) {
ItemStack itemStack = event.getItem();
Block block = event.getClickedBlock();
if (block != null && block.getState() instanceof Sign) {
if(itemStack == null) {
Tamikaschu marked this conversation as resolved.
Show resolved Hide resolved
return;
}
if (DYES.contains(itemStack.getType())) {
Location location = BukkitUtil.adapt(block.getLocation());
PlotArea area = location.getPlotArea();
if (area == null) {
return;
}
Plot plot = location.getOwnedPlot();
if (plot == null) {
if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) {
event.setCancelled(true);
}
return;
}
if (plot.isAdded(event.getPlayer().getUniqueId())) {
return; // allow for added players
}
if (!plot.getFlag(EditSignFlag.class)) {
plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false");
event.setCancelled(true);
}
}
}
}

@EventHandler(ignoreCancelled = true)
public void onEffect(@NonNull EntityPotionEffectEvent event) {
if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
Expand Down
Loading