EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass 1 at reworking the Territory Access system.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-29 10:23:39 +02:00
parent 03684c78f1
commit 66b4eb4b92
13 changed files with 478 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class Board extends Entity<Board> implements BoardInterface
if (ps == null) return null;
ps = ps.getChunkCoords(true);
TerritoryAccess ret = this.map.get(ps);
if (ret == null) ret = new TerritoryAccess(UConf.get(this).factionIdNone);
if (ret == null) ret = TerritoryAccess.valueOf(UConf.get(this).factionIdNone);
return ret;
}
@ -98,8 +98,8 @@ public class Board extends Entity<Board> implements BoardInterface
public Faction getFactionAt(PS ps)
{
if (ps == null) return null;
String factionId = this.getTerritoryAccessAt(ps).getHostFactionId();
return FactionColls.get().get(this).get(factionId);
TerritoryAccess ta = this.getTerritoryAccessAt(ps);
return ta.getHostFaction(ps);
}
// SET
@ -127,7 +127,7 @@ public class Board extends Entity<Board> implements BoardInterface
TerritoryAccess territoryAccess = null;
if (faction != null)
{
territoryAccess = new TerritoryAccess(faction.getId());
territoryAccess = TerritoryAccess.valueOf(faction.getId());
}
this.setTerritoryAccessAt(ps, territoryAccess);
}