Fix holograms, item frames and skulls on dimension switch for PE clients

Author: MrPowerGamerBR

src/protocolsupportpocketstuff/hacks/holograms/HologramsPacketListener.java

@@ -1,6 +1,7 @@
 package protocolsupportpocketstuff.hacks.holograms;
 
 import io.netty.buffer.ByteBuf;
+import net.minecraft.server.v1_12_R1.PacketPlayOutRespawn;
 import protocolsupport.api.Connection;
 import protocolsupport.api.Connection.PacketListener;
 import protocolsupport.protocol.packet.middleimpl.clientbound.play.v_pe.SetPosition;
@@ -49,6 +50,15 @@ public HologramsPacketListener(Connection con) {
 		this.con = con;
 	}
 
+	@Override
+	public void onPacketSending(PacketEvent event) {
+		// ===[ WORLD SWITCH ]===
+		if (event.getPacket() instanceof PacketPlayOutRespawn) {
+			cachedArmorStands.clear();
+			return;
+		}
+	}
+
 	@Override
 	public void onRawPacketSending(RawPacketEvent event) {
 		ByteBuf data = event.getData();
@@ -58,11 +68,6 @@ public void onRawPacketSending(RawPacketEvent event) {
 		data.readByte();
 		data.readByte();
 
-		if (packetId == PEPacketIDs.CHANGE_DIMENSION) {
-			// Clear cached holograms on dimension switch
-			cachedArmorStands.clear();
-			return;
-		}
 		if (packetId == PEPacketIDs.ENTITY_TELEPORT) {
 			long entityId = VarNumberSerializer.readVarLong(data);
 

src/protocolsupportpocketstuff/hacks/itemframes/ItemFramesPacketListener.java

@@ -6,6 +6,7 @@
 import net.minecraft.server.v1_12_R1.PacketPlayInUseEntity;
 import net.minecraft.server.v1_12_R1.PacketPlayOutEntityDestroy;
 import net.minecraft.server.v1_12_R1.PacketPlayOutEntityMetadata;
+import net.minecraft.server.v1_12_R1.PacketPlayOutRespawn;
 import net.minecraft.server.v1_12_R1.PacketPlayOutSpawnEntity;
 import protocolsupport.api.Connection;
 import protocolsupport.protocol.serializer.ItemStackSerializer;
@@ -117,6 +118,11 @@ public ItemFramesPacketListener(ProtocolSupportPocketStuff plugin, Connection co
 	public void onPacketSending(PacketEvent event) {
 		super.onPacketSending(event);
 
+		// ===[ WORLD SWITCH ]===
+		if (event.getPacket() instanceof PacketPlayOutRespawn) {
+			cachedItemFrames.clear();
+			return;
+		}
 		// ===[ SPAWN ]===
 		if (event.getPacket() instanceof PacketPlayOutSpawnEntity) {
 			PacketPlayOutSpawnEntity packet = (PacketPlayOutSpawnEntity) event.getPacket();

src/protocolsupportpocketstuff/hacks/skulls/SkullTilePacketListener.java

@@ -2,6 +2,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import net.minecraft.server.v1_12_R1.PacketPlayOutRespawn;
 import org.apache.commons.lang3.Validate;
 import protocolsupport.api.Connection;
 import protocolsupport.libs.com.google.gson.JsonObject;
@@ -50,6 +51,15 @@ public SkullTilePacketListener(Connection con) {
 		this.con = con;
 	}
 
+	@Override
+	public void onPacketSending(PacketEvent event) {
+		// ===[ WORLD SWITCH ]===
+		if (event.getPacket() instanceof PacketPlayOutRespawn) {
+			cachedSkullBlocks.clear();
+			return;
+		}
+	}
+
 	@Override
 	public void onRawPacketSending(RawPacketEvent event) {
 		ByteBuf data = event.getData();
@@ -58,10 +68,6 @@ public void onRawPacketSending(RawPacketEvent event) {
 		data.readByte();
 		data.readByte();
 
-		if (packetId == PEPacketIDs.CHANGE_DIMENSION) {
-			cachedSkullBlocks.clear();
-			return;
-		}
 		if (packetId == PEPacketIDs.TILE_DATA_UPDATE) {
 			Position position = new Position(0, 0, 0);
 			PositionSerializer.readPEPositionTo(data, position);