diff options
author | md_5 <git@md-5.net> | 2016-12-21 07:00:00 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-12-21 07:00:00 +1100 |
commit | 8ea0c87f515290c35baf0029f7b2e046c1ff49cb (patch) | |
tree | 3ac51dcfdc206a175b73ec4013bd53c423e9b6e4 /src/main/java | |
parent | c8ff65136f23a3c2770b8d9ca508f61927f8acba (diff) | |
download | craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.gz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.lz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.xz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.zip |
Update to Minecraft 1.11.1
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/Main.java | 2 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index f9760b67..959a63b9 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -173,7 +173,7 @@ public class Main { Date buildDate = new SimpleDateFormat("yyyyMMdd-HHmm").parse(Main.class.getPackage().getImplementationVendor()); Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -10); + deadline.add(Calendar.DAY_OF_YEAR, -3); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***"); diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java index 759dac00..728e0c5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java +++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java @@ -106,6 +106,8 @@ public class CraftEnchantment extends Enchantment { return "FIRE_ASPECT"; case 21: return "LOOT_BONUS_MOBS"; + case 22: + return "SWEEPING"; case 32: return "DIG_SPEED"; case 33: @@ -156,7 +158,7 @@ public class CraftEnchantment extends Enchantment { return false; } CraftEnchantment ench = (CraftEnchantment) other; - return !target.a(ench.target); + return !target.c(ench.target); } public net.minecraft.server.Enchantment getHandle() { |