FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-23 21:40:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions3

Fix inconsistent ordering of item attribute modifiers by using a linked hashmap ()

Browse source
This commit is contained in:
Technici4n 2022-07-21 21:08:00 +02:00 • committed by modmuss50
parent 2d30af4b7a
commit 17cbbd436b
1 changed files with 3 additions and 3 deletions

6
fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemStackMixin.java
View file

@ -18,7 +18,7 @@ package net.fabricmc.fabric.mixin.item;
import java.util.function.Consumer;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@ -83,8 +83,8 @@ public abstract class ItemStackMixin {
)
public Multimap<EntityAttribute, EntityAttributeModifier> hookGetAttributeModifiers(Item item, EquipmentSlot slot) {
ItemStack stack = (ItemStack) (Object) this;
//we need to ensure it is modifiable for the callback
Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers = HashMultimap.create(item.getAttributeModifiers(stack, slot));
//we need to ensure it is modifiable for the callback, use linked map to preserve ordering
Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers = LinkedHashMultimap.create(item.getAttributeModifiers(stack, slot));
ModifyItemAttributeModifiersCallback.EVENT.invoker().modifyAttributeModifiers(stack, slot, attributeModifiers);
return attributeModifiers;
}