Merge branch 'master' of https://github.com/ProtocolSupport/ProtocolSupportPocketStuff.git into master-stach

Author: 7kasper

src/protocolsupportpocketstuff/hacks/itemframes/ItemFramesPacketListener.java

@@ -62,6 +62,8 @@ public class ItemFramesPacketListener extends Connection.PacketListener {
 	private static final int ITEM_FRAME_BLOCK_ID_DATA2 = 1726;
 	private static final int ITEM_FRAME_BLOCK_ID_DATA3 = 1727;
 
+	int sentLoginSpawnedStatus = 0;
+
 	public ItemFramesPacketListener(ProtocolSupportPocketStuff plugin, Connection con) {
 		this.con = con;
 	}
@@ -281,11 +283,6 @@ public void onRawPacketSending(RawPacketEvent event) {
 		data.readByte();
 		data.readByte();
 
-		if (packetId == PEPacketIDs.CHANGE_DIMENSION) {
-			// Clear cached item frames on dimension switch
-			cachedItemFrames.clear();
-			return;
-		}
 		if (packetId == PEPacketIDs.UPDATE_BLOCK) {
 			Position position = new Position(0, 0, 0); 
 			PositionSerializer.readPEPositionTo(data, position);
@@ -301,8 +298,8 @@ public void onRawPacketSending(RawPacketEvent event) {
 			return;
 		}
 		if (packetId == PEPacketIDs.CHUNK_DATA) {
-			int chunkX = VarNumberSerializer.readSVarInt(event.getData());
-			int chunkZ = VarNumberSerializer.readSVarInt(event.getData());
+			int chunkX = VarNumberSerializer.readSVarInt(data);
+			int chunkZ = VarNumberSerializer.readSVarInt(data);
 
 			for (Map.Entry<Integer, CachedItemFrame> entry : cachedItemFrames.entrySet()) {
 				int itemChunkX = entry.getValue().getX() >> 4;

src/protocolsupportpocketstuff/hacks/skulls/SkullTilePacketListener.java

@@ -156,12 +156,9 @@ public void onRawPacketSending(RawPacketEvent event) {
 			chunkdata.readByte(); // borders
 			VarNumberSerializer.readSVarInt(chunkdata); // extra data
 
-			System.out.println("owo whats this? WE ARE RECEIVING CHUNK " + chunkX + ", " + chunkZ);
-
 			while (chunkdata.readableBytes() != 0) {
 				NBTTagCompoundWrapper tag = ItemStackSerializer.readTag(chunkdata, true, con.getVersion());
 
-				System.out.println("owo tag: " + tag);
 				if (!isSkull(tag))
 					continue;