diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/events/AnvilBlockDamagedScriptEvent.java b/paper/src/main/java/com/denizenscript/denizen/paper/events/AnvilBlockDamagedScriptEvent.java index effc8f9e27..5f4268d66b 100644 --- a/paper/src/main/java/com/denizenscript/denizen/paper/events/AnvilBlockDamagedScriptEvent.java +++ b/paper/src/main/java/com/denizenscript/denizen/paper/events/AnvilBlockDamagedScriptEvent.java @@ -36,7 +36,7 @@ public class AnvilBlockDamagedScriptEvent extends BukkitScriptEvent implements L // // @Determine // "STATE:" to set the anvil's new damage state. - // "BREAK:" to set weather the anvil will break. + // "BREAK:" to set whether the anvil will break. // --> public AnvilBlockDamagedScriptEvent() { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java index 0d17a6c1ed..e48095f853 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRaiseLowerItemScriptEvent.java @@ -1,6 +1,8 @@ package com.denizenscript.denizen.events.player; import com.denizenscript.denizen.events.BukkitScriptEvent; +import com.denizenscript.denizen.nms.NMSHandler; +import com.denizenscript.denizen.nms.NMSVersion; import com.denizenscript.denizen.objects.ItemTag; import com.denizenscript.denizen.objects.PlayerTag; import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData; @@ -9,6 +11,7 @@ import com.denizenscript.denizencore.objects.core.ElementTag; import com.denizenscript.denizencore.scripts.ScriptEntryData; import org.bukkit.Material; +import org.bukkit.Tag; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -55,6 +58,12 @@ public class PlayerRaiseLowerItemScriptEvent extends BukkitScriptEvent implement public static final EnumSet raisableItems = EnumSet.of(Material.SHIELD, Material.CROSSBOW, Material.BOW, Material.TRIDENT, Material.SPYGLASS); + static { + if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_21)) { + raisableItems.addAll(Tag.ITEMS_SPEARS.getValues()); + } + } + public PlayerRaiseLowerItemScriptEvent() { registerCouldMatcher("player raises|lowers|toggles "); registerSwitches("reason");