From 17962f66ec0a65adf666863fa05f32f528bd529e Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Sun, 18 Jan 2015 17:33:13 +0000
Subject: SPIGOT-443: Synchronize access to HANDLED_TAGS as Spigot uses it
 async

---
 .../craftbukkit/inventory/CraftMetaItem.java       | 44 +++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 7ebb70bf..4681262a 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -691,26 +691,28 @@ class CraftMetaItem implements ItemMeta, Repairable {
     }
 
     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;
+        }
     }
 }
-- 
cgit v1.2.3