diff --git a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch index d2161fcbff..79896de072 100644 --- a/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ContainerCreative.java.patch @@ -19,7 +19,7 @@ + for (Item item : Item.itemsList) { - if (Item.itemsList[var10] != null && Item.itemsList[var10].shiftedIndex != Item.potion.shiftedIndex && Item.itemsList[var10].shiftedIndex != Item.monsterPlacer.shiftedIndex) -+ if (item != null && x++ >= 256) ++ if (x++ >= 256 && item != null) { - this.itemList.add(new ItemStack(Item.itemsList[var10])); + item.addCreativeItems((ArrayList)itemList); diff --git a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch index e249cdd8e6..12e5d50bc2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Packet230ModLoader.java.patch @@ -1,14 +1,118 @@ --- ../src_base/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/Packet230ModLoader.java 0000-00-00 00:00:00.000000000 -0000 -@@ -76,10 +76,7 @@ +@@ -13,6 +13,7 @@ + public int packetType; + public int[] dataInt = new int[0]; + public float[] dataFloat = new float[0]; ++ public double[] dataDouble = new double[0]; + public String[] dataString = new String[0]; + private static Map playerMap = new HashMap(); - byte[] var7 = new byte[var6]; +@@ -59,29 +60,42 @@ + + if (var4 > 65535) + { +- throw new IOException(String.format("String data size of %d is higher than the max (%d).", new Object[] {Integer.valueOf(var4), Integer.valueOf(65535)})); ++ throw new IOException(String.format("Double data size of %d is higher than the max (%d).", new Object[] {Integer.valueOf(var4), Integer.valueOf(65535)})); + } + else + { +- this.dataString = new String[var4]; ++ this.dataDouble = new double[var4]; + + for (int var5 = 0; var5 < var4; ++var5) + { +- int var6 = var1.readInt(); +- +- if (var6 > 65535) +- { +- throw new IOException(String.format("String length of %d is higher than the max (%d).", new Object[] {Integer.valueOf(var6), Integer.valueOf(65535)})); +- } ++ this.dataDouble[var5] = var1.readDouble(); ++ } + +- byte[] var7 = new byte[var6]; ++ var4 = var1.readInt(); - for (int var8 = 0; var8 < var6; var8 += var1.read(var7, var8, var6 - var8)) -- { ++ if (var4 > 65535) ++ { ++ throw new IOException(String.format("String data size of %d is higher than the max (%d).", new Object[] {Integer.valueOf(var4), Integer.valueOf(65535)})); ++ } ++ else ++ { ++ this.dataString = new String[var4]; ++ ++ for (int var5 = 0; var5 < var4; ++var5) + { - ; -- } -+ var1.readFully(var7); - - this.dataString[var5] = new String(var7); ++ int var6 = var1.readInt(); ++ ++ if (var6 > 65535) ++ { ++ throw new IOException(String.format("String length of %d is higher than the max (%d).", new Object[] {Integer.valueOf(var6), Integer.valueOf(65535)})); ++ } ++ ++ byte[] var7 = new byte[var6]; ++ ++ var1.readFully(var7); ++ ++ this.dataString[var5] = new String(var7); + } +- +- this.dataString[var5] = new String(var7); } + } + } +@@ -139,6 +153,20 @@ + } + } + ++ if (this.dataDouble == null) ++ { ++ var1.writeInt(0); ++ } ++ else ++ { ++ var1.writeInt(this.dataDouble.length); ++ ++ for (var2 = 0; var2 < this.dataDouble.length; ++var2) ++ { ++ var1.writeDouble(this.dataDouble[var2]); ++ } ++ } ++ + if (this.dataString == null) + { + var1.writeInt(0); +@@ -193,19 +221,22 @@ + */ + public int getPacketSize() + { +- byte var1 = 1; +- int var3 = var1 + 1; +- ++var3; +- var3 += this.dataInt != null ? this.dataInt.length * 32 : 0; +- ++var3; +- var3 += this.dataFloat != null ? this.dataFloat.length * 32 : 0; +- ++var3; ++ byte var1 = 0; ++ int var3 = var1 + 4; ++ var3 += 4; ++ var3 += 4; ++ var3 += this.dataInt != null ? this.dataInt.length * 4 : 0; ++ var3 += 4; ++ var3 = this.dataFloat != null ? this.dataFloat.length * 4 : 0; ++ var3 += 4; ++ var3 = this.dataDouble != null ? this.dataDouble.length * 8 : 0; ++ var3 += 4; + + if (this.dataString != null) + { + for (int var2 = 0; var2 < this.dataString.length; ++var2) + { +- ++var3; ++ var3 += 4; + var3 += this.dataString[var2].length(); + } + }