Skip to content

Backup wolf collar in 1.21.5->1.21.4 #1344

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
Oct 1, 2026
Merged

Backup wolf collar in 1.21.5->1.21.4 #1344

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
4 changes: 3 additions & 1 deletion ...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 @@ -462,6 +462,7 @@ protected void backupInconvertibleData(final UserConnection connection, final It
saveIntData(StructuredDataKey.COW_VARIANT, dataContainer, backupTag);
saveIntData(StructuredDataKey.PIG_VARIANT, dataContainer, backupTag);
saveIntData(StructuredDataKey.WOLF_VARIANT, dataContainer, backupTag);
saveIntData(StructuredDataKey.WOLF_COLLAR, dataContainer, backupTag);

final Either<Integer, String> chickenVariant = dataContainer.get(StructuredDataKey.CHICKEN_VARIANT1_21_5);
if (chickenVariant != null) {
Expand Down Expand Up @@ -546,7 +547,7 @@ protected void restoreBackupData(final Item item, final StructuredDataContainer
final float disableCooldownScale = blocksAttackTag.getFloat("disable_cooldown_scale");
final CompoundTag itemDamageTag = blocksAttackTag.getCompoundTag("item_damage");
final ItemDamageFunction itemDamage = new ItemDamageFunction(itemDamageTag.getFloat("threshold"), itemDamageTag.getFloat("base"), itemDamageTag.getFloat("factor"));
final String bypassedBy = blocksAttackTag.getString("bypassed_by");
final String bypassedBy = itemDamageTag.getString("bypassed_by");
final Holder<SoundEvent> blockSound = blocksAttackTag.contains("block_sound") ? restoreHolder(blocksAttackTag, "block_sound", this::tagToSound) : null;
final Holder<SoundEvent> disableSound = blocksAttackTag.contains("disable_sound") ? restoreHolder(blocksAttackTag, "disable_sound", this::tagToSound) : null;

Expand Down Expand Up @@ -602,6 +603,7 @@ protected void restoreBackupData(final Item item, final StructuredDataContainer
restoreIntData(StructuredDataKey.COW_VARIANT, data, backupTag);
restoreIntData(StructuredDataKey.PIG_VARIANT, data, backupTag);
restoreIntData(StructuredDataKey.WOLF_VARIANT, data, backupTag);
restoreIntData(StructuredDataKey.WOLF_COLLAR, data, backupTag);

restoreHolderData(StructuredDataKey.BREAK_SOUND, data, backupTag, this::tagToSound);
restoreHolderData(StructuredDataKey.PAINTING_VARIANT, data, backupTag, tag -> {
Expand Down