From fec9294c477ba81414988eabcec06e375053183e Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 3 Jul 2021 09:33:04 +1000 Subject: [PATCH] SPIGOT-6615 Fix Glow Item Frame to use EntityTagMeta By: Doc --- .../java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java | 2 +- .../java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java | 1 + .../java/org/bukkit/craftbukkit/inventory/CraftItemStack.java | 1 + .../org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java index c704784dfe..f507b6bd99 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftGlowItemFrame.java @@ -22,6 +22,6 @@ public class CraftGlowItemFrame extends CraftItemFrame implements GlowItemFrame @Override public String toString() { - return "CraftGlowItemFrame"; + return "CraftGlowItemFrame{item=" + getItem() + ", rotation=" + getRotation() + "}"; } } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index 7bcf8a3bdf..3fb36c7deb 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -264,6 +264,7 @@ public final class CraftItemFactory implements ItemFactory { case PUFFERFISH_BUCKET: case SALMON_BUCKET: case ITEM_FRAME: + case GLOW_ITEM_FRAME: case PAINTING: return meta instanceof CraftMetaEntityTag ? meta : new CraftMetaEntityTag(meta); case COMPASS: diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index b9b08fb9c9..a7182e39c2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -533,6 +533,7 @@ public final class CraftItemStack extends ItemStack { case PUFFERFISH_BUCKET: case SALMON_BUCKET: case ITEM_FRAME: + case GLOW_ITEM_FRAME: case PAINTING: return new CraftMetaEntityTag(item.getTag()); case COMPASS: diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java index a8a5db50ff..ce48b38149 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaEntityTag.java @@ -69,6 +69,7 @@ public class CraftMetaEntityTag extends CraftMetaItem { case PUFFERFISH_BUCKET: case SALMON_BUCKET: case ITEM_FRAME: + case GLOW_ITEM_FRAME: case PAINTING: return true; default: