Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE caused by lazy cleanup

Browse Source
This commit is contained in:
Olof Larsson 2017-05-15 07:18:12 +02:00
parent 3f123922ba
commit 18976b57be
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/massivecraft/factions/TerritoryAccess.java
View File

@ -80,9 +80,11 @@ public class TerritoryAccess
// FIELDS: DIRECT // FIELDS: DIRECT
// -------------------------------------------- // // -------------------------------------------- //
// This method intentionally returns null if the Faction no longer exists.
// In Board we don't even return this TerritoryAccess if that is the case.
public Faction getHostFaction() public Faction getHostFaction()
{ {
return FactionColl.get().get(this.getHostFactionId()); return Faction.get(this.getHostFactionId());
} }
public Set<MPlayer> getGrantedMPlayers() public Set<MPlayer> getGrantedMPlayers()
@ -108,7 +110,9 @@ public class TerritoryAccess
// Fill // Fill
for (String factionId : this.getFactionIds()) for (String factionId : this.getFactionIds())
{ {
ret.add(FactionColl.get().get(factionId)); Faction faction = Faction.get(factionId);
if (faction == null) continue;
ret.add(faction);
} }
// Return // Return

2
src/com/massivecraft/factions/entity/Board.java
View File

@ -92,7 +92,7 @@ public class Board extends Entity<Board> implements BoardInterface
if (ps == null) return null; if (ps == null) return null;
ps = ps.getChunkCoords(true); ps = ps.getChunkCoords(true);
TerritoryAccess ret = this.map.get(ps); TerritoryAccess ret = this.map.get(ps);
if (ret == null) ret = TerritoryAccess.valueOf(Factions.ID_NONE); if (ret == null || ret.getHostFaction() == null) ret = TerritoryAccess.valueOf(Factions.ID_NONE);
return ret; return ret;
} }