Update to Minecraft 1.11

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions

View File

@@ -1,26 +1,26 @@
--- a/net/minecraft/server/TileEntityBanner.java
+++ b/net/minecraft/server/TileEntityBanner.java
@@ -21,6 +21,11 @@
@@ -23,6 +23,11 @@
if (nbttagcompound.hasKey("Patterns")) {
this.patterns = nbttagcompound.getList("Patterns", 10).d();
+ // CraftBukkit start
+ while (this.patterns.size() > 20) {
+ this.patterns.remove(20);
+ }
+ // CraftBukkit end
}
if (nbttagcompound != null && nbttagcompound.hasKeyOfType("Patterns", 9)) {
this.patterns = nbttagcompound.getList("Patterns", 10).d();
+ // CraftBukkit start
+ while (this.patterns.size() > 20) {
+ this.patterns.remove(20);
+ }
+ // CraftBukkit end
}
if (nbttagcompound.hasKeyOfType("Base", 99)) {
@@ -56,6 +61,11 @@
super.a(nbttagcompound);
this.color = nbttagcompound.getInt("Base");
this.color = flag ? d(itemstack) : ItemBanner.c(itemstack);
@@ -67,6 +72,11 @@
this.color = EnumColor.fromInvColorIndex(nbttagcompound.getInt("Base"));
this.patterns = nbttagcompound.getList("Patterns", 10);
+ // CraftBukkit start
+ while (this.patterns.size() > 20) {
+ this.patterns.remove(20);
+ }
+ // CraftBukkit end
this.h = null;
this.i = null;
this.j = null;
this.k = null;