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

Fixed carry ability not showing on the first page for alicorns

Browse source
This commit is contained in:
Sollace 2020-10-11 13:25:51 +02:00
parent 0f70bec9bc
commit 132980d4fe
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/minelittlepony/unicopia/ability/AbilityDispatcher.java
View file

@ -3,8 +3,11 @@ package com.minelittlepony.unicopia.ability;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.Race;
@ -204,11 +207,16 @@ public class AbilityDispatcher implements Tickable, NbtSerialisable {
public Optional<Ability<?>> getAbility(long page) { public Optional<Ability<?>> getAbility(long page) {
Race race = player.getSpecies(); Race race = player.getSpecies();
return Abilities.BY_SLOT.computeIfAbsent(slot, c -> Collections.emptySet()) List<Ability<?>> found = Abilities.BY_SLOT.computeIfAbsent(slot, c -> Collections.emptySet())
.stream() .stream()
.filter(a -> a.canUse(race)) .filter(a -> a.canUse(race))
.skip(page) .collect(Collectors.toList());
.findFirst(); if (found.isEmpty()) {
return Optional.empty();
}
page = Math.min(found.size() - 1, page);
return Optional.ofNullable(found.get((int)page));
} }
public long getMaxPage() { public long getMaxPage() {