Fix respawn screen appearing twice in 1.8->1.7 (#597)

* Fixed double respawn screen displaying

* Only remove, don't re-add

---------

Co-authored-by: FlorianMichael <florian.michael07@gmail.com>

Author: EthanKeating

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/PlayerPacketRewriter1_8.java

@@ -18,6 +18,7 @@
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
 
 import com.viaversion.viarewind.ViaRewind;
+import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
@@ -31,6 +32,7 @@
 import com.viaversion.viarewind.api.minecraft.math.Vector3d;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.minecraft.GameProfile;
+import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -49,6 +51,7 @@
 import io.netty.buffer.Unpooled;
 
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -121,10 +124,15 @@ public void register() {
 					if (tracker.getEntityData().isEmpty()) {
 						return;
 					}
-					// 1.8 clients do keep entity data after respawn, 1.7 clients don't
+
+                    // TODO figure out why this is needed
+                    final List<EntityData> entityDataList = new ArrayList<>(tracker.getEntityData());
+                    entityDataList.removeIf(entityData -> entityData.id() == 6);
+
+                    // 1.8 clients do keep entity data after respawn, 1.7 clients don't
 					final PacketWrapper setEntityData = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_ENTITY_DATA, wrapper.user());
 					setEntityData.write(Types.INT, tracker.clientEntityId());
-					setEntityData.write(RewindTypes.ENTITY_DATA_LIST1_7, tracker.getEntityData());
+					setEntityData.write(RewindTypes.ENTITY_DATA_LIST1_7, entityDataList);
 					setEntityData.send(Protocol1_8To1_7_6_10.class);
 				});
 			}