Skip to content

Fix conditions swap in kinetic weapon restore in 1.21.11->1.21.9 #1343

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

Fix conditions swap in kinetic weapon restore in 1.21.11->1.21.9 #1343

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
9 changes: 3 additions & 6 deletions ...rsion/viabackwards/protocol/v1_21_11to1_21_9/rewriter/BlockItemPacketRewriter1_21_11.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@
import com.viaversion.viaversion.api.minecraft.SoundEvent;
import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
import com.viaversion.viaversion.api.minecraft.data.predicate.DataComponentPredicate;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.api.minecraft.item.data.AdventureModePredicate;
import com.viaversion.viaversion.api.minecraft.item.data.AttackRange;
import com.viaversion.viaversion.api.minecraft.item.data.BlockPredicate;
import com.viaversion.viaversion.api.minecraft.item.data.KineticWeapon;
import com.viaversion.viaversion.api.minecraft.item.data.PiercingWeapon;
import com.viaversion.viaversion.api.minecraft.item.data.SwingAnimation;
Expand Down Expand Up @@ -111,14 +108,14 @@ protected void restoreBackupData(final Item item, final StructuredDataContainer
if (kineticTag != null) {
final int contactCooldownTicks = kineticTag.getInt("contact_cooldown_ticks");
final int delayTicks = kineticTag.getInt("delay_ticks");
final KineticWeapon.Condition damageConditions = loadDamageCondition(kineticTag, "damage_conditions");
final KineticWeapon.Condition dismountConditions = loadDamageCondition(kineticTag, "dismount_conditions");
final KineticWeapon.Condition knockbackConditions = loadDamageCondition(kineticTag, "knockback_conditions");
final KineticWeapon.Condition damageConditions = loadDamageCondition(kineticTag, "damage_conditions");
final float forwardMovement = kineticTag.getFloat("forward_movement");
final float damageMultiplier = kineticTag.getFloat("damage_multiplier");
final Holder<SoundEvent> sound = kineticTag.contains("sound") ? restoreSoundEventHolder(kineticTag, "sound") : null;
final Holder<SoundEvent> hitSound = kineticTag.contains("hit_sound") ? restoreSoundEventHolder(kineticTag, "hit_sound") : null;
container.set(StructuredDataKey.KINETIC_WEAPON, new KineticWeapon(contactCooldownTicks, delayTicks, damageConditions, dismountConditions, knockbackConditions, forwardMovement, damageMultiplier, sound, hitSound));
container.set(StructuredDataKey.KINETIC_WEAPON, new KineticWeapon(contactCooldownTicks, delayTicks, dismountConditions, knockbackConditions, damageConditions, forwardMovement, damageMultiplier, sound, hitSound));
}

final CompoundTag piercingTag = backupTag.getCompoundTag("piercing_weapon");
Expand Down Expand Up @@ -199,9 +196,9 @@ protected void backupInconvertibleData(final UserConnection connection, final It
final CompoundTag kineticTag = new CompoundTag();
kineticTag.putInt("contact_cooldown_ticks", kineticWeapon.contactCooldownTicks());
kineticTag.putInt("delay_ticks", kineticWeapon.delayTicks());
saveDamageCondition(kineticTag, "damage_conditions", kineticWeapon.damageConditions());
saveDamageCondition(kineticTag, "dismount_conditions", kineticWeapon.dismountConditions());
saveDamageCondition(kineticTag, "knockback_conditions", kineticWeapon.knockbackConditions());
saveDamageCondition(kineticTag, "damage_conditions", kineticWeapon.damageConditions());
kineticTag.putFloat("forward_movement", kineticWeapon.forwardMovement());
kineticTag.putFloat("damage_multiplier", kineticWeapon.damageMultiplier());
if (kineticWeapon.sound() != null) {
Expand Down