Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-23 18:55:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix MemoryBoard#hasFactionWithin implementation

Browse Source 
It was previously only checking for factions diagonally within the
designated radius
This commit is contained in:
eueln 2015-02-20 17:08:29 -06:00
parent 2b4e1a1947
commit 1daf79c6c3
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
View File

@ -113,30 +113,23 @@ public abstract class MemoryBoard extends Board {
* @return true if another Faction is within the radius, otherwise false.
*/
public boolean hasFactionWithin(FLocation flocation, Faction faction, int radius) {
for(int i = 1; i <= radius; i++) {
FLocation a = flocation.getRelative(i, 0);
FLocation b = flocation.getRelative(-i, 0);
FLocation c = flocation.getRelative(0, i);
FLocation d = flocation.getRelative(0, -i);
if(isDifferentFaction(a, faction) || isDifferentFaction(b, faction) || isDifferentFaction(c, faction) || isDifferentFaction(d, faction)) {
return false; // Return if the Faction found is a different one.
for (int x = -radius; x <= radius; x++) {
for (int z = -radius; z <= radius; z++) {
if (x == 0 && z == 0) {
continue;
}
FLocation relative = flocation.getRelative(x, z);
Faction other = getFactionAt(relative);
if (other.isNormal() && other != faction) {
return true;
}
}
}
return false;
}
/**
* Checks if the faction at the flocation is not wilderness and different than given faction.
* @param flocation - location to check.
* @param faction - faction to compare.
* @return true if not wilderness, safezone, or warzone and different faction, otherwise false.
*/
private boolean isDifferentFaction(FLocation flocation, Faction faction) {
Faction other = getFactionAt(flocation);
// Check if faction is
return other.isNormal() && other != faction;
}
//----------------------------------------------//
// Cleaner. Remove orphaned foreign keys