Properly pass on packet type in PacketWrapper.create

Author: kennytv

api/src/main/java/com/viaversion/viaversion/api/protocol/packet/PacketWrapper.java

@@ -258,9 +258,7 @@ default void scheduleSend(Class<? extends Protocol> protocol) throws Informative
      * @param packetType packet type of the new packet
      * @return The newly created packet wrapper
      */
-    default PacketWrapper create(PacketType packetType) {
-        return create(packetType.getId());
-    }
+    PacketWrapper create(PacketType packetType);
 
     /**
      * Creates a new packet with values.
@@ -269,9 +267,7 @@ default PacketWrapper create(PacketType packetType) {
      * @param handler    handler to write to the packet
      * @return newly created packet wrapper
      */
-    default PacketWrapper create(PacketType packetType, PacketHandler handler) throws InformativeException {
-        return create(packetType.getId(), handler);
-    }
+    PacketWrapper create(PacketType packetType, PacketHandler handler) throws InformativeException;
 
     /**
      * Creates a new packet for the target of this packet.

common/src/main/java/com/viaversion/viaversion/protocol/packet/PacketWrapperImpl.java

@@ -429,6 +429,18 @@ public PacketWrapperImpl create(int packetId, PacketHandler handler) throws Info
         return wrapper;
     }
 
+    @Override
+    public PacketWrapperImpl create(final PacketType packetType) {
+        return new PacketWrapperImpl(packetType, null, user());
+    }
+
+    @Override
+    public PacketWrapperImpl create(final PacketType packetType, final PacketHandler handler) throws InformativeException {
+        PacketWrapperImpl wrapper = create(packetType);
+        handler.handle(wrapper);
+        return wrapper;
+    }
+
     @Override
     public void apply(Direction direction, State state, List<Protocol> pipeline) throws InformativeException, CancelException {
         // Indexed loop to allow additions to the tail

common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/storage/ConfigurationState.java

@@ -113,10 +113,10 @@ public void sendQueuedPackets(final UserConnection connection) {
             packetQueue.add(hasJoinGamePacket ? 1 : 0, toQueuedPacket(clientInformationPacket, false, true));
         }
 
-        final ConfigurationState.QueuedPacket[] queuedPackets = packetQueue.toArray(EMPTY_PACKET_ARRAY);
+        final QueuedPacket[] queuedPackets = packetQueue.toArray(EMPTY_PACKET_ARRAY);
         packetQueue.clear();
 
-        for (final ConfigurationState.QueuedPacket packet : queuedPackets) {
+        for (final QueuedPacket packet : queuedPackets) {
             final PacketWrapper queuedWrapper;
             try {
                 if (packet.packetType() != null) {
@@ -176,7 +176,7 @@ public static final class QueuedPacket {
         private final int packetId;
         private final boolean skipCurrentPipeline;
 
-        private QueuedPacket(final ByteBuf buf, final boolean clientbound, final PacketType packetType,
+        private QueuedPacket(final ByteBuf buf, final boolean clientbound, @Nullable final PacketType packetType,
                              final int packetId, final boolean skipCurrentPipeline) {
             this.buf = buf;
             this.clientbound = clientbound;