Skip to content

Commit 9a79f9e

Browse files
Owen1212055FlorianMichaelkennytv
authored
Delay mannequin spawning for proper skin application (#1158)
Co-authored-by: FlorianMichael <[email protected]> Co-authored-by: Nassim Jahnke <[email protected]>
1 parent 44476f2 commit 9a79f9e

File tree

4 files changed

+328
-30
lines changed

4 files changed

+328
-30
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
5656
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundConfigurationPackets1_21_9;
5757
import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPacket1_21_9;
58+
import com.viaversion.viaversion.protocols.v1_21to1_21_2.storage.BundleStateTracker;
5859
import com.viaversion.viaversion.rewriter.ParticleRewriter;
5960
import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
6061
import com.viaversion.viaversion.rewriter.StatisticsRewriter;
@@ -202,6 +203,7 @@ protected void registerPackets() {
202203
wrapper.write(Types.VAR_INT, 0); // Subscription registry id (DEDICATED_SERVER_TICK_TIME)
203204
}
204205
});
206+
registerClientbound(ClientboundPackets1_21_9.BUNDLE_DELIMITER, wrapper -> wrapper.user().get(BundleStateTracker.class).toggleBundling());
205207

206208
cancelClientbound(ClientboundPackets1_21_9.DEBUG_BLOCK_VALUE);
207209
cancelClientbound(ClientboundPackets1_21_9.DEBUG_CHUNK_VALUE);
@@ -216,6 +218,7 @@ public void init(final UserConnection connection) {
216218
addItemHasher(connection, new ItemHasherBase(this, connection));
217219
connection.put(new PlayerRotationStorage());
218220
connection.put(new DimensionScaleStorage());
221+
connection.put(new BundleStateTracker());
219222
}
220223

221224
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public void registerPackets() {
6868
registerSetContent1_21_2(ClientboundPackets1_21_9.CONTAINER_SET_CONTENT);
6969
registerSetSlot1_21_2(ClientboundPackets1_21_9.CONTAINER_SET_SLOT);
7070
registerAdvancements1_20_3(ClientboundPackets1_21_9.UPDATE_ADVANCEMENTS);
71-
registerSetEquipment(ClientboundPackets1_21_9.SET_EQUIPMENT);
7271
registerMerchantOffers1_20_5(ClientboundPackets1_21_9.MERCHANT_OFFERS);
7372
registerContainerClick1_21_5(ServerboundPackets1_21_6.CONTAINER_CLICK);
7473
registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_6.SET_CREATIVE_MODE_SLOT);

0 commit comments

Comments
 (0)