diff options
| author | Thinkofname <thinkofdeath@spigotmc.org> | 2016-03-30 20:50:59 +0100 |
|---|---|---|
| committer | Thinkofname <thinkofdeath@spigotmc.org> | 2016-03-30 21:06:51 +0100 |
| commit | 6e527e5b884902df883eb1a3d594ba4dc5147962 (patch) | |
| tree | c066763146d5c5bb50bdf6c6896f8490c884b3df /src | |
| parent | 7fc5cd856e46182e727f383a911ffa46326611f1 (diff) | |
| download | craftbukkit-6e527e5b884902df883eb1a3d594ba4dc5147962.tar craftbukkit-6e527e5b884902df883eb1a3d594ba4dc5147962.tar.gz craftbukkit-6e527e5b884902df883eb1a3d594ba4dc5147962.tar.lz craftbukkit-6e527e5b884902df883eb1a3d594ba4dc5147962.tar.xz craftbukkit-6e527e5b884902df883eb1a3d594ba4dc5147962.zip | |
Update to Minecraft 1.9.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftSound.java | 1 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java index 0aa88555..396ef4bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java @@ -424,6 +424,7 @@ public enum CraftSound { ITEM_BUCKET_FILL("item.bucket.fill"), ITEM_BUCKET_FILL_LAVA("item.bucket.fill_lava"), ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"), + ITEM_ELYTRA_FLYING("item.elytra.flying"), ITEM_FIRECHARGE_USE("item.firecharge.use"), ITEM_FLINTANDSTEEL_USE("item.flintandsteel.use"), ITEM_HOE_TILL("item.hoe.till"), diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java index 3bc313cb..2e6c5669 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -22,6 +22,7 @@ public final class CraftItemFactory implements ItemFactory { ConfigurationSerialization.registerClass(CraftMetaItem.SerializableMeta.class); KNOWN_NBT_ATTRIBUTE_NAMES = ImmutableSet.<String>builder() .add("generic.armor") + .add("generic.armorToughness") .add("generic.attackDamage") .add("generic.followRange") .add("generic.knockbackResistance") |