Fix EntityFramed

also typo fix and extra meta note
DenizenScript · Jul 24, 2021 · 81b4c00 · 81b4c00
1 parent 180da25
commit 81b4c00
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/PacketHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/PacketHelper.java
@@ -105,7 +105,7 @@ default void setMapData(MapCanvas canvas, byte[] bytes, int x, int y, MapImage i
         }
     }
 
-    default void showDebugTestMaker(Player player, Location location, ColorTag color, int alpha, String name, int time) {
+    default void showDebugTestMarker(Player player, Location location, ColorTag color, int alpha, String name, int time) {
         throw new UnsupportedOperationException();
     }
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFramed.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityFramed.java
@@ -11,14 +11,13 @@
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import org.bukkit.Material;
 import org.bukkit.Rotation;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ItemFrame;
 
 public class EntityFramed implements Property {
 
     // TODO: Possibly merge class with EntityItem?
     public static boolean describes(ObjectTag entity) {
-        return entity instanceof EntityTag && ((EntityTag) entity).getBukkitEntityType() == EntityType.ITEM_FRAME;
+        return entity instanceof EntityTag && ((EntityTag) entity).getBukkitEntity() instanceof ItemFrame;
     }
 
     public static EntityFramed getFrom(ObjectTag entity) {

diff --git a/...in/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java b/...in/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java
@@ -130,7 +130,7 @@ public void execute(ScriptEntry scriptEntry) {
             int alphaInt = (int) (alpha.asFloat() * 255);
             for (LocationTag location : locations) {
                 for (PlayerTag player : players) {
-                    NMSHandler.getPacketHelper().showDebugTestMaker(player.getPlayerEntity(), location, color, alphaInt, name == null ? "" : name.asString(), (int) duration.getMillis());
+                    NMSHandler.getPacketHelper().showDebugTestMarker(player.getPlayerEntity(), location, color, alphaInt, name == null ? "" : name.asString(), (int) duration.getMillis());
                 }
             }
         }

diff --git a/...in/java/com/denizenscript/denizen/scripts/containers/core/EnchantmentScriptContainer.java b/...in/java/com/denizenscript/denizen/scripts/containers/core/EnchantmentScriptContainer.java
@@ -155,6 +155,7 @@ public class EnchantmentScriptContainer extends ScriptContainer {
     //   - narrate "You attacked <context.victim.name> with a <context.level> enchantment!"
     //
     //   # Triggered after an enchanted armor is used to defend against an attack.
+    //   # Also fires if an entity is holding a weapon with this enchantment while being hit.
     //   # Has <context.attacker> (EntityTag), <context.victim> (EntityTag), and <context.level>.
     //   # | Some enchantment scripts should have this key.
     //   after hurt:

diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/PacketHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/PacketHelperImpl.java
@@ -450,7 +450,7 @@ public void setNetworkManagerFor(Player player) {
     }
 
     @Override
-    public void showDebugTestMaker(Player player, Location location, ColorTag color, int alpha, String name, int time) {
+    public void showDebugTestMarker(Player player, Location location, ColorTag color, int alpha, String name, int time) {
         ResourceLocation packetKey = new ResourceLocation("minecraft", "debug/game_test_add_marker");
         FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
         buf.writeBlockPos(new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()));