Skip to content

Fix crash due to relationships with disbanded factions #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BlueZeeKing merged 2 commits into from
Aug 29, 2025
Merged

Fix crash due to relationships with disbanded factions #144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc01fc2
fix relationships with disbanded factions
xllifi Aug 26, 2025
2f14f18
implement requested changes
xllifi Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/main/java/io/icker/factions/api/persistents/Faction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.stream.Stream;

@Name("Faction")
public class Faction {
Expand Down Expand Up @@ -84,6 +85,10 @@ public Faction(

public Faction() {}

public Stream<Relationship> getRelationships() {
return relationships.stream().filter(rel -> Faction.get(rel.target) != null);
}

public String getKey() {
return id.toString();
}
Expand Down Expand Up @@ -224,7 +229,7 @@ public void setHome(Home home) {
}

public Relationship getRelationship(UUID target) {
return relationships.stream()
return this.relationships.stream()
.filter(rel -> rel.target.equals(target))
.findFirst()
.orElse(new Relationship(target, Relationship.Status.NEUTRAL));
Expand All @@ -241,25 +246,25 @@ public boolean isMutualAllies(UUID target) {
}

public List<Relationship> getMutualAllies() {
return relationships.stream().filter(rel -> isMutualAllies(rel.target)).toList();
return this.getRelationships().filter(rel -> isMutualAllies(rel.target)).toList();
}

public List<Relationship> getEnemiesWith() {
return relationships.stream()
return this.getRelationships()
.filter(rel -> rel.status == Relationship.Status.ENEMY)
.toList();
}

public List<Relationship> getEnemiesOf() {
return relationships.stream()
return this.getRelationships()
.filter(rel -> getReverse(rel).status == Relationship.Status.ENEMY)
.toList();
}

public void removeRelationship(UUID target) {
relationships =
relationships =
new ArrayList<>(
relationships.stream().filter(rel -> !rel.target.equals(target)).toList());
this.getRelationships().filter(rel -> !rel.target.equals(target)).toList());
}

public void setRelationship(Relationship relationship) {
Expand Down
Loading