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

Equipping a new spell will no longer discard what you had equipped before

Browse source
This commit is contained in:
Sollace 2022-09-11 15:42:57 +02:00
parent 22ada528fd
commit 700f2a50e4
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/minelittlepony/unicopia/item/GemstoneItem.java
View file

@ -44,10 +44,19 @@ public class GemstoneItem extends Item {
PlayerCharmTracker charms = Pony.of(user).getCharms(); PlayerCharmTracker charms = Pony.of(user).getCharms();
TypedActionResult<CustomisedSpellType<?>> spell = consumeSpell(stack, user, ((Predicate<CustomisedSpellType<?>>)charms.getEquippedSpell(hand)::equals).negate()); TypedActionResult<CustomisedSpellType<?>> spell = consumeSpell(stack, user, ((Predicate<CustomisedSpellType<?>>)charms.getEquippedSpell(hand)::equals).negate());
CustomisedSpellType<?> existing = charms.getEquippedSpell(hand);
if (existing != null) {
stack = existing.traits().applyTo(enchant(stack, existing.type()));
}
if (spell.getResult().isAccepted()) { if (spell.getResult().isAccepted()) {
charms.equipSpell(hand, spell.getValue()); charms.equipSpell(hand, spell.getValue());
return TypedActionResult.success(stack, true); } else {
charms.equipSpell(hand, SpellType.EMPTY_KEY.withTraits());
} }
return TypedActionResult.success(stack, true);
} }
return result; return result;