Skip to content

Fix missing entity data for Pig and Strider saddles (1.21.5 -> 1.21.4) #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennytv merged 1 commit into from
Jan 17, 2026
Merged

Fix missing entity data for Pig and Strider saddles (1.21.5 -> 1.21.4) #1182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions ...version/viabackwards/protocol/v1_21_5to1_21_4/rewriter/BlockItemPacketRewriter1_21_5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ public void registerPackets() {
final Item item = wrapper.read(itemType());
if (equipmentSlot == SADDLE_EQUIPMENT_SLOT) {
// Send saddle entity data for horses
if (trackedEntity != null && trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.ABSTRACT_HORSE)) {
if (trackedEntity != null && (
trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.ABSTRACT_HORSE)
|| trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.PIG)
|| trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.STRIDER)
)) {
sendSaddledEntityData(wrapper.user(), trackedEntity, entityId, item.identifier() == 800);
}
} else {
Expand Down Expand Up @@ -285,30 +289,44 @@ private void convertClientAsset(final PacketWrapper wrapper) {
}

private void sendSaddledEntityData(final UserConnection connection, final TrackedEntity trackedEntity, final int entityId, final boolean saddled) {
byte data = 0;
if (trackedEntity.hasData()) {
final HorseDataStorage horseDataStorage = trackedEntity.data().get(HorseDataStorage.class);
if (horseDataStorage != null) {
if (horseDataStorage.saddled() == saddled) {
return;
EntityData entityData = null;

if (trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.ABSTRACT_HORSE)) {
byte data = 0;
if (trackedEntity.hasData()) {
final HorseDataStorage horseDataStorage = trackedEntity.data().get(HorseDataStorage.class);
if (horseDataStorage != null) {
if (horseDataStorage.saddled() == saddled) {
return;
}

data = horseDataStorage.data();
}
}

trackedEntity.data().put(new HorseDataStorage(data, saddled));

data = horseDataStorage.data();
if (saddled) {
data = (byte) (data | SADDLED_FLAG);
}
}

trackedEntity.data().put(new HorseDataStorage(data, saddled));
entityData = new EntityData(17, VersionedTypes.V1_21_4.entityDataTypes.byteType, data);

} else if (trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.PIG)) {
entityData = new EntityData(17, VersionedTypes.V1_21_4.entityDataTypes.booleanType, saddled);

if (saddled) {
data = (byte) (data | SADDLED_FLAG);
} else if (trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.STRIDER)) {
entityData = new EntityData(19, VersionedTypes.V1_21_4.entityDataTypes.booleanType, saddled);
}

final PacketWrapper entityDataPacket = PacketWrapper.create(ClientboundPackets1_21_2.SET_ENTITY_DATA, connection);
final List<EntityData> entityDataList = new ArrayList<>();
entityDataList.add(new EntityData(17, VersionedTypes.V1_21_4.entityDataTypes.byteType, data));
entityDataPacket.write(Types.VAR_INT, entityId);
entityDataPacket.write(VersionedTypes.V1_21_4.entityDataList, entityDataList);
entityDataPacket.send(Protocol1_21_5To1_21_4.class);
if (entityData != null) {
final PacketWrapper entityDataPacket = PacketWrapper.create(ClientboundPackets1_21_2.SET_ENTITY_DATA, connection);
final List<EntityData> entityDataList = new ArrayList<>();
entityDataList.add(entityData);
entityDataPacket.write(Types.VAR_INT, entityId);
entityDataPacket.write(VersionedTypes.V1_21_4.entityDataList, entityDataList);
entityDataPacket.send(Protocol1_21_5To1_21_4.class);
}
}

private String heightmapType(final int id) {
Expand Down