SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.9

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
View File

@@ -10,7 +10,7 @@ public class CraftEnchantment extends Enchantment {
private final net.minecraft.server.Enchantment target;
public CraftEnchantment(net.minecraft.server.Enchantment target) {
super(target.id);
super(net.minecraft.server.Enchantment.getId(target));
this.target = target;
}
@@ -26,7 +26,7 @@ public class CraftEnchantment extends Enchantment {
@Override
public EnchantmentTarget getItemTarget() {
switch (target.slot) {
switch (target.itemTarget) {
case ALL:
return EnchantmentTarget.ALL;
case ARMOR:
@@ -37,7 +37,7 @@ public class CraftEnchantment extends Enchantment {
return EnchantmentTarget.ARMOR_HEAD;
case ARMOR_LEGS:
return EnchantmentTarget.ARMOR_LEGS;
case ARMOR_TORSO:
case ARMOR_CHEST:
return EnchantmentTarget.ARMOR_TORSO;
case DIGGER:
return EnchantmentTarget.TOOL;
@@ -59,7 +59,7 @@ public class CraftEnchantment extends Enchantment {
@Override
public String getName() {
switch (target.id) {
switch (getId()) {
case 0:
return "PROTECTION_ENVIRONMENTAL";
case 1:
@@ -111,7 +111,7 @@ public class CraftEnchantment extends Enchantment {
case 62:
return "LURE";
default:
return "UNKNOWN_ENCHANT_" + target.id;
return "UNKNOWN_ENCHANT_" + getId();
}
}
@@ -138,4 +138,8 @@ public class CraftEnchantment extends Enchantment {
CraftEnchantment ench = (CraftEnchantment) other;
return !target.a(ench.target);
}
public net.minecraft.server.Enchantment getHandle() {
return target;
}
}