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

Update to Minecraft 1.9

Browse Source
This commit is contained in:
md_5
2016-03-01 08:32:46 +11:00
parent e1ebe524a7
commit aa008dff0f
305 changed files with 6684 additions and 6105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
nms-patches/PacketDataSerializer.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PacketDataSerializer.java
+++ b/net/minecraft/server/PacketDataSerializer.java
@@ -21,6 +21,8 @@
@@ -20,6 +20,8 @@
import java.nio.charset.Charset;
import java.util.UUID;
@@ -9,16 +9,16 @@
public class PacketDataSerializer extends ByteBuf {
private final ByteBuf a;
@@ -68,7 +70,7 @@
@@ -99,7 +101,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
- return ((Enum[]) oclass.getEnumConstants())[this.g()];
+ return ((T[]) oclass.getEnumConstants())[this.g()]; // CraftBukkit - fix decompile error
}
public void a(Enum<?> oenum) {
@@ -142,7 +144,7 @@
public PacketDataSerializer a(Enum<?> oenum) {
@@ -176,7 +178,7 @@
} else {
try {
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) (new ByteBufOutputStream(this)));
@@ -27,19 +27,19 @@
throw new EncoderException(ioexception);
}
}
@@ -162,7 +164,7 @@
@@ -202,7 +204,7 @@
}
public void a(ItemStack itemstack) {
public PacketDataSerializer a(ItemStack itemstack) {
- if (itemstack == null) {
+ if (itemstack == null || itemstack.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem()
this.writeShort(-1);
} else {
this.writeShort(Item.getId(itemstack.getItem()));
@@ -189,6 +191,11 @@
@@ -230,6 +232,11 @@
itemstack = new ItemStack(Item.getById(short0), b0, short1);
itemstack.setTag(this.h());
itemstack.setTag(this.j());
+ // CraftBukkit start
+ if (itemstack.getTag() != null) {
+ CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
@@ -48,20 +48,3 @@
}
return itemstack;
@@ -803,16 +810,4 @@
public boolean release(int i) {
return this.a.release(i);
}
-
- public ReferenceCounted retain(int i) {
- return this.retain(i);
- }
-
- public ReferenceCounted retain() {
- return this.retain();
- }
-
- public int compareTo(Object object) {
- return this.compareTo((ByteBuf) object);
- }
}