Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-10 10:28:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2146 from BentoBoxWorld/Ignore_waxed_signs

Browse Source 
If sign is waxed (not editable) then no check is required
This commit is contained in:
tastybento 2023-06-24 11:13:33 -07:00 committed by GitHub
commit 2ed2492ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java
View File

@ -7,6 +7,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.block.Block;
import org.bukkit.block.Sign;
import org.bukkit.block.data.Waterlogged;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
@ -33,7 +34,7 @@ public class BlockInteractionListener extends FlagListener
*
* @param e - event
*/
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onPlayerInteract(final PlayerInteractEvent e)
{
// We only care about the RIGHT_CLICK_BLOCK action.
@ -43,7 +44,7 @@ public class BlockInteractionListener extends FlagListener
}
// Check clicked block
this.checkClickedBlock(e, e.getPlayer(), e.getClickedBlock().getLocation(), e.getClickedBlock().getType());
this.checkClickedBlock(e, e.getPlayer(), e.getClickedBlock());
// Now check for in-hand items
if (e.getItem() != null && !e.getItem().getType().equals(Material.AIR))
@ -85,11 +86,12 @@ public class BlockInteractionListener extends FlagListener
*
* @param e - event called
* @param player - player
* @param loc - location of clicked block
* @param type - material type of clicked block
* @param block - block being clicked or used
*/
private void checkClickedBlock(Event e, Player player, Location loc, Material type)
private void checkClickedBlock(Event e, Player player, Block block)
{
Material type = block.getType();
Location loc = block.getLocation();
// Handle pots
if (type.name().startsWith("POTTED"))
{
@ -133,7 +135,8 @@ public class BlockInteractionListener extends FlagListener
return;
}
if (Tag.SIGNS.isTagged(type)) {
if (Tag.SIGNS.isTagged(type) && block.getState() instanceof Sign sign && !sign.isWaxed()) {
// If waxed, then sign cannot be edited otherwise check
this.checkIsland(e, player, loc, Flags.SIGN_EDITING);
return;
}
@ -232,7 +235,7 @@ public class BlockInteractionListener extends FlagListener
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onBlockBreak(final BlockBreakEvent e)
{
this.checkClickedBlock(e, e.getPlayer(), e.getBlock().getLocation(), e.getBlock().getType());
this.checkClickedBlock(e, e.getPlayer(), e.getBlock());
}

2
src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java
View File

@ -221,7 +221,7 @@ public class ServerCompatibility {
/**
* @since 1.24.0
*/
V1_20(Compatibility.COMPATIBLE),
V1_20(Compatibility.INCOMPATIBLE),
/**
* @since 1.24.0
*/