twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-04 22:22:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.3

Browse Source
This commit is contained in:
Thinkofdeath
2015-02-26 22:41:06 +00:00
parent 33d5de312e
commit d8a9c7be42
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
nms-patches/PacketDataSerializer.patch
View File

@@ -1,14 +1,6 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/PacketDataSerializer.java 2014-11-28 17:43:43.265707431 +0000
+++ src/main/java/net/minecraft/server/PacketDataSerializer.java 2014-11-28 17:38:23.000000000 +0000
@@ -8,7 +8,6 @@
import io.netty.buffer.ByteBufProcessor;
import io.netty.handler.codec.DecoderException;
import io.netty.handler.codec.EncoderException;
-import io.netty.util.ReferenceCounted;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -21,6 +20,8 @@
--- /home/matt/mc-dev-private//net/minecraft/server/PacketDataSerializer.java 2015-02-26 22:40:22.899608136 +0000
+++ src/main/java/net/minecraft/server/PacketDataSerializer.java 2015-02-26 22:40:22.903608136 +0000
@@ -21,6 +21,8 @@
import java.nio.charset.Charset;
import java.util.UUID;
@@ -17,7 +9,16 @@
public class PacketDataSerializer extends ByteBuf {
private final ByteBuf a;
@@ -142,7 +143,7 @@
@@ -68,7 +70,7 @@
}
public <T extends Enum<T>> T a(Class<T> oclass) {
- return ((Enum[]) oclass.getEnumConstants())[this.e()];
+ return ((T[]) oclass.getEnumConstants())[this.e()]; // CraftBukkit - fix decompile error
}
public void a(Enum<?> oenum) {
@@ -142,7 +144,7 @@
} else {
try {
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) (new ByteBufOutputStream(this)));
@@ -26,7 +27,7 @@
throw new EncoderException(ioexception);
}
}
@@ -162,7 +163,7 @@
@@ -162,7 +164,7 @@
}
public void a(ItemStack itemstack) {
@@ -35,7 +36,7 @@
this.writeShort(-1);
} else {
this.writeShort(Item.getId(itemstack.getItem()));
@@ -189,6 +190,11 @@
@@ -189,6 +191,11 @@
itemstack = new ItemStack(Item.getById(short0), b0, short1);
itemstack.setTag(this.h());
@@ -47,63 +48,7 @@
}
return itemstack;
@@ -416,11 +422,11 @@
return this.a.getBytes(i, bytebuffer);
}
- public ByteBuf getBytes(int i, OutputStream outputstream, int j) {
+ public ByteBuf getBytes(int i, OutputStream outputstream, int j) throws IOException { // CraftBukkit - throws IOException
return this.a.getBytes(i, outputstream, j);
}
- public int getBytes(int i, GatheringByteChannel gatheringbytechannel, int j) {
+ public int getBytes(int i, GatheringByteChannel gatheringbytechannel, int j) throws IOException { // CraftBukkit - throws IOException
return this.a.getBytes(i, gatheringbytechannel, j);
}
@@ -484,11 +490,11 @@
return this.a.setBytes(i, bytebuffer);
}
- public int setBytes(int i, InputStream inputstream, int j) {
+ public int setBytes(int i, InputStream inputstream, int j) throws IOException { // CraftBukkit - throws IOException
return this.a.setBytes(i, inputstream, j);
}
- public int setBytes(int i, ScatteringByteChannel scatteringbytechannel, int j) {
+ public int setBytes(int i, ScatteringByteChannel scatteringbytechannel, int j) throws IOException { // CraftBukkit - throws IOException
return this.a.setBytes(i, scatteringbytechannel, j);
}
@@ -580,11 +586,11 @@
return this.a.readBytes(bytebuffer);
}
- public ByteBuf readBytes(OutputStream outputstream, int i) {
+ public ByteBuf readBytes(OutputStream outputstream, int i) throws IOException { // CraftBukkit - throws IOException
return this.a.readBytes(outputstream, i);
}
- public int readBytes(GatheringByteChannel gatheringbytechannel, int i) {
+ public int readBytes(GatheringByteChannel gatheringbytechannel, int i) throws IOException { // CraftBukkit - throws IOException
return this.a.readBytes(gatheringbytechannel, i);
}
@@ -652,11 +658,11 @@
return this.a.writeBytes(bytebuffer);
}
- public int writeBytes(InputStream inputstream, int i) {
+ public int writeBytes(InputStream inputstream, int i) throws IOException { // CraftBukkit - throws IOException
return this.a.writeBytes(inputstream, i);
}
- public int writeBytes(ScatteringByteChannel scatteringbytechannel, int i) {
+ public int writeBytes(ScatteringByteChannel scatteringbytechannel, int i) throws IOException { // CraftBukkit - throws IOException
return this.a.writeBytes(scatteringbytechannel, i);
}
@@ -803,16 +809,4 @@
@@ -803,16 +810,4 @@
public boolean release(int i) {
return this.a.release(i);
}