Skip to content

Commit 504de4f

Browse files
committed
Always remap entity equipment
1 parent 66d2e5e commit 504de4f

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,18 @@ public void registerPackets() {
203203
final int entityId = wrapper.passthrough(Types.VAR_INT);
204204

205205
final TrackedEntity trackedEntity = tracker(wrapper.user()).entity(entityId);
206-
if (trackedEntity == null) {
207-
return;
208-
}
206+
final MannequinData mannequinData = trackedEntity == null ? null : trackedEntity.data().get(MannequinData.class);
207+
209208

210-
final MannequinData mannequinData = trackedEntity.data().get(MannequinData.class);
211-
if (mannequinData == null) {
212-
return;
213-
}
214209
byte slot;
215210
do {
216211
slot = wrapper.passthrough(Types.BYTE);
217212

218213
final Item item = protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.read(protocol.getItemRewriter().itemType()));
219214
wrapper.write(protocol.getItemRewriter().itemType(), item);
220-
mannequinData.setEquipment(slot, item);
215+
if (mannequinData != null) {
216+
mannequinData.setEquipment(slot, item);
217+
}
221218
} while (slot < 0);
222219
});
223220
// All of this is related to mananequin tracking

0 commit comments

Comments
 (0)