PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-30 16:28:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash due to attributes not being removed (tryRemove doesn't try hard enough)

Browse source
This commit is contained in:
Sollace 2023-10-24 01:02:48 +01:00
parent 5f545745be
commit a1f91a591a
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/BubbleSpell.java
View file

@ -143,7 +143,7 @@ public class BubbleSpell extends AbstractSpell implements TimedSpell,
if (source.asEntity() instanceof LivingEntity l) { if (source.asEntity() instanceof LivingEntity l) {
MODIFIERS.forEach((attribute, modifier) -> { MODIFIERS.forEach((attribute, modifier) -> {
if (l.getAttributes().hasAttribute(attribute)) { if (l.getAttributes().hasAttribute(attribute)) {
l.getAttributeInstance(attribute).tryRemoveModifier(modifier.getId()); l.getAttributeInstance(attribute).removeModifier(modifier.getId());
} }
}); });
} }

2
src/main/java/com/minelittlepony/unicopia/entity/Living.java
View file

@ -366,7 +366,7 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
EntityAttributeModifier modifier = instance.getModifier(id); EntityAttributeModifier modifier = instance.getModifier(id);
if (!MathHelper.approximatelyEquals(desiredValue, modifier == null ? 0 : modifier.getValue())) { if (!MathHelper.approximatelyEquals(desiredValue, modifier == null ? 0 : modifier.getValue())) {
instance.tryRemoveModifier(id); instance.removeModifier(id);
if (desiredValue != 0) { if (desiredValue != 0) {
if (permanent) { if (permanent) {

2
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java
View file

@ -89,7 +89,7 @@ public class PlayerAttributes implements Tickable {
instance.addPersistentModifier(modifier); instance.addPersistentModifier(modifier);
} }
} else { } else {
instance.tryRemoveModifier(modifier.getId()); instance.removeModifier(modifier.getId());
} }
}); });
} }

2
src/main/java/com/minelittlepony/unicopia/item/enchantment/AttributedEnchantment.java
View file

@ -44,7 +44,7 @@ public class AttributedEnchantment extends SimpleEnchantment {
modifiers.forEach((attr, modifierSupplier) -> { modifiers.forEach((attr, modifierSupplier) -> {
EntityAttributeInstance instance = user.asEntity().getAttributeInstance(attr); EntityAttributeInstance instance = user.asEntity().getAttributeInstance(attr);
instance.tryRemoveModifier(modifierSupplier.get(user, 1).getId()); instance.removeModifier(modifierSupplier.get(user, 1).getId());
}); });
user.getEnchants().remove(this); user.getEnchants().remove(this);
} }