PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-08 06:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix time change ability not appearing for unicorns wearing the unicorn amulet

Browse source
This commit is contained in:
Sollace 2023-08-29 15:17:44 +01:00
parent 82ec2b4f14
commit 8385232c5b
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/Race.java
View file

@ -186,13 +186,13 @@ public record Race (boolean canCast, FlightType flightType, boolean canUseEarth,
return REGISTRY.stream().filter(r -> r.isPermitted(player)).collect(Collectors.toSet()); return REGISTRY.stream().filter(r -> r.isPermitted(player)).collect(Collectors.toSet());
} }
public record Composite (Race physical, Race pseudo) { public record Composite (Race physical, @Nullable Race pseudo) {
public boolean includes(Race race) { public boolean includes(Race race) {
return physical == race || pseudo == race; return physical == race || pseudo == race;
} }
public boolean any(Predicate<Race> test) { public boolean any(Predicate<Race> test) {
return test.test(physical) || test.test(pseudo); return test.test(physical) || (pseudo != null && test.test(pseudo));
} }
} }
} }

2
src/main/java/com/minelittlepony/unicopia/ability/TimeChangeAbility.java
View file

@ -18,7 +18,7 @@ public class TimeChangeAbility implements Ability<Hit> {
@Override @Override
public boolean canUse(Race.Composite race) { public boolean canUse(Race.Composite race) {
return race.physical() != race.pseudo() && race.pseudo() == Race.UNICORN; return race.pseudo() == Race.UNICORN;
} }
@Override @Override

3
src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
View file

@ -229,7 +229,8 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
return new Race.Composite(observed, return new Race.Composite(observed,
AmuletSelectors.UNICORN_AMULET.test(entity) ? Race.UNICORN AmuletSelectors.UNICORN_AMULET.test(entity) ? Race.UNICORN
: AmuletSelectors.ALICORN_AMULET.test(entity) ? Race.ALICORN : AmuletSelectors.ALICORN_AMULET.test(entity) ? Race.ALICORN
: observed); : null
);
} }
/** /**