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

Update to Minecraft 1.11.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-12-21 07:00:00 +11:00
parent 74902a47aa
commit f9a809b2ba
29 changed files with 368 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
View File

@@ -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/ ***");

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

@@ -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() {