Bundle packets, fix issue

Author: Owen1212055

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java

@@ -55,6 +55,7 @@
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundConfigurationPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPacket1_21_9;
+import com.viaversion.viaversion.protocols.v1_21to1_21_2.storage.BundleStateTracker;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
@@ -202,6 +203,7 @@ protected void registerPackets() {
                 wrapper.write(Types.VAR_INT, 0); // Subscription registry id (DEDICATED_SERVER_TICK_TIME)
             }
         });
+        registerClientbound(ClientboundPackets1_21_9.BUNDLE_DELIMITER, wrapper -> wrapper.user().get(BundleStateTracker.class).toggleBundling());
 
         cancelClientbound(ClientboundPackets1_21_9.DEBUG_BLOCK_VALUE);
         cancelClientbound(ClientboundPackets1_21_9.DEBUG_CHUNK_VALUE);
@@ -216,6 +218,7 @@ public void init(final UserConnection connection) {
         addItemHasher(connection, new ItemHasherBase(this, connection));
         connection.put(new PlayerRotationStorage());
         connection.put(new DimensionScaleStorage());
+        connection.put(new BundleStateTracker());
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java

@@ -45,6 +45,7 @@
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPacket1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
+import com.viaversion.viaversion.protocols.v1_21to1_21_2.storage.BundleStateTracker;
 import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandler;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import java.util.BitSet;
@@ -203,7 +204,9 @@ public void registerPackets() {
             final TrackedEntity trackedEntity = tracker.entity(vehicleId);
             if (trackedEntity != null && trackedEntity.hasData()) {
                 MannequinData data = trackedEntity.data().get(MannequinData.class);
-                data.setHeadYaw(headRotation);
+                if (data != null) {
+                    data.setHeadYaw(headRotation);
+                }
             }
         });
 
@@ -449,6 +452,12 @@ protected void registerRewrites() {
                 mannequinData.setDisplayName(displayName);
                 sendPlayerInfoDisplayNameUpdate(event.user(), mannequinData, displayName);
             } else if (event.index() == 17) { // Profile
+                final boolean isBundling = event.user().get(BundleStateTracker.class).isBundling();
+                if (!isBundling) {
+                    final PacketWrapper bundleStart = PacketWrapper.create(ClientboundPackets1_21_6.BUNDLE_DELIMITER, event.user());
+                    bundleStart.send(Protocol1_21_9To1_21_7.class);
+                }
+
                 final ResolvableProfile profile = data.value();
                 final MannequinData entity = event.trackedEntity().data().get(MannequinData.class);
                 final UUID uuid = event.trackedEntity().data().get(MannequinData.class).uuid();
@@ -513,6 +522,11 @@ protected void registerRewrites() {
                     equipment.send(Protocol1_21_9To1_21_7.class);
                 }
 
+                if (!isBundling) {
+                    final PacketWrapper bundleStart = PacketWrapper.create(ClientboundPackets1_21_6.BUNDLE_DELIMITER, event.user());
+                    bundleStart.send(Protocol1_21_9To1_21_7.class);
+                }
+
                 event.cancel();
             } else if (event.index() == 15) {
                 event.setIndex(18);