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

Some minor cleanup to TerritoryAccess source code.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 14:05:00 +02:00
parent a891fc8a0a
commit 00774087d3
4 changed files with 102 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/factions/Board.java
View File

@@ -32,7 +32,7 @@ public class Board
{
if ( ! flocationIds.containsKey(flocation)) return "0";
return flocationIds.get(flocation).getHostFactionID();
return flocationIds.get(flocation).getHostFactionId();
}
public static TerritoryAccess getTerritoryAccessAt(FLocation flocation)
@@ -84,7 +84,7 @@ public class Board
while (iter.hasNext())
{
Entry<FLocation, TerritoryAccess> entry = iter.next();
if (entry.getValue().getHostFactionID().equals(factionId))
if (entry.getValue().getHostFactionId().equals(factionId))
{
if(ConfServer.onUnclaimResetLwcLocks && LWCFeatures.getEnabled())
LWCFeatures.clearAllChests(entry.getKey());
@@ -126,12 +126,12 @@ public class Board
Iterator<Entry<FLocation, TerritoryAccess>> iter = flocationIds.entrySet().iterator();
while (iter.hasNext()) {
Entry<FLocation, TerritoryAccess> entry = iter.next();
if ( ! FactionColl.i.exists(entry.getValue().getHostFactionID()))
if ( ! FactionColl.i.exists(entry.getValue().getHostFactionId()))
{
if(ConfServer.onUnclaimResetLwcLocks && LWCFeatures.getEnabled())
LWCFeatures.clearAllChests(entry.getKey());
Factions.get().log("Board cleaner removed "+entry.getValue().getHostFactionID()+" from "+entry.getKey());
Factions.get().log("Board cleaner removed "+entry.getValue().getHostFactionId()+" from "+entry.getKey());
iter.remove();
}
}
@@ -146,7 +146,7 @@ public class Board
int ret = 0;
for (TerritoryAccess thatFactionId : flocationIds.values())
{
if(thatFactionId.getHostFactionID().equals(factionId))
if(thatFactionId.getHostFactionId().equals(factionId))
{
ret += 1;
}
@@ -166,7 +166,7 @@ public class Board
Iterator<Entry<FLocation, TerritoryAccess>> iter = flocationIds.entrySet().iterator();
while (iter.hasNext()) {
Entry<FLocation, TerritoryAccess> entry = iter.next();
if (entry.getValue().getHostFactionID().equals(factionId) && entry.getKey().getWorldName().equals(worldName))
if (entry.getValue().getHostFactionId().equals(factionId) && entry.getKey().getWorldName().equals(worldName))
{
ret += 1;
}