Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/ContainerSetSlotPacket.cpp b/Minecraft.World/ContainerSetSlotPacket.cpp
index 42892f3c..de8d2680 100644
--- a/Minecraft.World/ContainerSetSlotPacket.cpp
+++ b/Minecraft.World/ContainerSetSlotPacket.cpp
@@ -22,7 +22,7 @@ ContainerSetSlotPacket::ContainerSetSlotPacket(int containerId, int slot, shared
 {
 	this->containerId = containerId;
 	this->slot = slot;
-	this->item = item == NULL ? item : item->copy();
+	this->item = item == nullptr ? item : item->copy();
 }
 
 void ContainerSetSlotPacket::handle(PacketListener *listener) 
@@ -35,7 +35,7 @@ void ContainerSetSlotPacket::read(DataInputStream *dis) //throws IOException
 	// 4J Stu - TU-1 hotfix
 	// Fix for #13142 - Holding down the A button on the furnace ingredient slot causes the UI to display incorrect item counts
 	BYTE byteId = dis->readByte();
-	containerId = *(char *)&byteId;
+    containerId = (char)(signed char)byteId;
 	slot = dis->readShort();
 	item = readItem(dis);
 }