Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-22 22:38:17 +01:00
51 Zeilen
1.7 KiB
Diff
51 Zeilen
1.7 KiB
Diff
--- a/net/minecraft/server/PacketDataSerializer.java
|
|
+++ b/net/minecraft/server/PacketDataSerializer.java
|
|
@@ -23,6 +23,8 @@
|
|
import java.util.UUID;
|
|
import javax.annotation.Nullable;
|
|
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack; // CraftBukkit
|
|
+
|
|
public class PacketDataSerializer extends ByteBuf {
|
|
|
|
private final ByteBuf a;
|
|
@@ -130,7 +132,7 @@
|
|
}
|
|
|
|
public <T extends Enum<T>> T a(Class<T> oclass) {
|
|
- return ((Enum[]) oclass.getEnumConstants())[this.g()];
|
|
+ return ((T[]) oclass.getEnumConstants())[this.g()]; // CraftBukkit - fix decompile error
|
|
}
|
|
|
|
public PacketDataSerializer a(Enum<?> oenum) {
|
|
@@ -207,7 +209,7 @@
|
|
} else {
|
|
try {
|
|
NBTCompressedStreamTools.a(nbttagcompound, (DataOutput) (new ByteBufOutputStream(this)));
|
|
- } catch (IOException ioexception) {
|
|
+ } catch (Exception ioexception) { // CraftBukkit - IOException -> Exception
|
|
throw new EncoderException(ioexception);
|
|
}
|
|
}
|
|
@@ -234,7 +236,7 @@
|
|
}
|
|
|
|
public PacketDataSerializer a(ItemStack itemstack) {
|
|
- if (itemstack.isEmpty()) {
|
|
+ if (itemstack.isEmpty() || itemstack.getItem() == null) { // CraftBukkit - NPE fix itemstack.getItem()
|
|
this.writeShort(-1);
|
|
} else {
|
|
Item item = itemstack.getItem();
|
|
@@ -263,6 +265,11 @@
|
|
ItemStack itemstack = new ItemStack(Item.getById(short0), b0);
|
|
|
|
itemstack.setTag(this.j());
|
|
+ // CraftBukkit start
|
|
+ if (itemstack.getTag() != null) {
|
|
+ CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
return itemstack;
|
|
}
|
|
}
|