Spigot / CraftBukkit / 17962f66ec0

Commits

BuildTools authored 17962f66ec0 18 Jan 2015

SPIGOT-443: Synchronize access to HANDLED_TAGS as Spigot uses it async

src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java

Modified

-684
-685
+        return false;
-686
+    }
-687
-688
+    @Override
-689
+    public final String toString() {
-690
+        return SerializableMeta.classMap.get(getClass()) + "_META:" + serialize(); // TODO: cry
-691
+    }
-692
-693
+    public static Set<String> getHandledTags() {
--
+        if (HANDLED_TAGS.isEmpty()) {
--
+            HANDLED_TAGS.addAll(Arrays.asList(
--
+                DISPLAY.NBT,
--
+                REPAIR.NBT,
--
+                ATTRIBUTES.NBT,
--
+                ENCHANTMENTS.NBT,
--
+                CraftMetaMap.MAP_SCALING.NBT,
--
+                CraftMetaPotion.POTION_EFFECTS.NBT,
--
+                CraftMetaSkull.SKULL_OWNER.NBT,
--
+                CraftMetaTileEntity.BLOCK_ENTITY_TAG.NBT,
--
+                CraftMetaBook.BOOK_TITLE.NBT,
--
+                CraftMetaBook.BOOK_AUTHOR.NBT,
--
+                CraftMetaBook.BOOK_PAGES.NBT,
--
+                CraftMetaBook.RESOLVED.NBT,
--
+                CraftMetaBook.GENERATION.NBT,
--
+                CraftMetaFirework.FIREWORKS.NBT,
--
+                CraftMetaEnchantedBook.STORED_ENCHANTMENTS.NBT,
--
+                CraftMetaCharge.EXPLOSION.NBT
--
+            ));
--
+        }
--
+        return HANDLED_TAGS;
-+
+        synchronized (HANDLED_TAGS) {
-+
+            if (HANDLED_TAGS.isEmpty()) {
-+
+                HANDLED_TAGS.addAll(Arrays.asList(
-+
+                    DISPLAY.NBT,
-+
+                    REPAIR.NBT,
-+
+                    ATTRIBUTES.NBT,
-+
+                    ENCHANTMENTS.NBT,
-+
+                    CraftMetaMap.MAP_SCALING.NBT,
-+
+                    CraftMetaPotion.POTION_EFFECTS.NBT,
-+
+                    CraftMetaSkull.SKULL_OWNER.NBT,
-+
+                    CraftMetaTileEntity.BLOCK_ENTITY_TAG.NBT,
-+
+                    CraftMetaBook.BOOK_TITLE.NBT,
-+
+                    CraftMetaBook.BOOK_AUTHOR.NBT,
-+
+                    CraftMetaBook.BOOK_PAGES.NBT,
-+
+                    CraftMetaBook.RESOLVED.NBT,
-+
+                    CraftMetaBook.GENERATION.NBT,
-+
+                    CraftMetaFirework.FIREWORKS.NBT,
-+
+                    CraftMetaEnchantedBook.STORED_ENCHANTMENTS.NBT,
-+
+                    CraftMetaCharge.EXPLOSION.NBT
-+
+                ));
-+
+            }
-+
+            return HANDLED_TAGS;
-+
+        }
-717
+    }
-718
+}

CraftBukkit

Commits

Jira Issues

Add shortcut