diff options
| author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
| commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
| tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/Enchantment.patch | |
| parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
| download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip | |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/Enchantment.patch')
| -rw-r--r-- | nms-patches/Enchantment.patch | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/nms-patches/Enchantment.patch b/nms-patches/Enchantment.patch index 5e419c5f..ddddc8e0 100644 --- a/nms-patches/Enchantment.patch +++ b/nms-patches/Enchantment.patch @@ -1,19 +1,23 @@ --- a/net/minecraft/server/Enchantment.java +++ b/net/minecraft/server/Enchantment.java -@@ -8,6 +8,7 @@ +@@ -16,7 +16,7 @@ + } - public abstract class Enchantment { + public static int getId(Enchantment enchantment) { +- return Enchantment.enchantments.a((Object) enchantment); ++ return Enchantment.enchantments.a(enchantment); // CraftBukkit - fix decompile error + } -+ // CraftBukkit - update CraftEnchant.getName(i) if this changes - private static final Enchantment[] byId = new Enchantment[256]; - public static final Enchantment[] b; - private static final Map<MinecraftKey, Enchantment> E = Maps.newHashMap(); -@@ -55,6 +56,8 @@ - Enchantment.byId[i] = this; - Enchantment.E.put(minecraftkey, this); - } -+ -+ org.bukkit.enchantments.Enchantment.registerEnchantment(new org.bukkit.craftbukkit.enchantments.CraftEnchantment(this)); // CraftBukkit + public static Enchantment b(String s) { +@@ -135,6 +135,11 @@ + Enchantment.enchantments.a(61, new MinecraftKey("luck_of_the_sea"), new EnchantmentLootBonus(Enchantment.Rarity.RARE, EnchantmentSlotType.FISHING_ROD, new EnumItemSlot[] { EnumItemSlot.MAINHAND})); + Enchantment.enchantments.a(62, new MinecraftKey("lure"), new EnchantmentLure(Enchantment.Rarity.RARE, EnchantmentSlotType.FISHING_ROD, new EnumItemSlot[] { EnumItemSlot.MAINHAND})); + Enchantment.enchantments.a(70, new MinecraftKey("mending"), new EnchantmentMending(Enchantment.Rarity.RARE, EnumItemSlot.values())); ++ // CraftBukkit start ++ for (Enchantment enchantment : Enchantment.enchantments) { ++ org.bukkit.enchantments.Enchantment.registerEnchantment(new org.bukkit.craftbukkit.enchantments.CraftEnchantment(enchantment)); ++ } ++ // CraftBukkit end } - public static Enchantment getByName(String s) { + public static enum Rarity { |