|
|
@ -1582,6 +1582,10 @@ public enum PowersManager { |
|
|
|
} |
|
|
|
} |
|
|
|
//second round add all others in window if they share a nation with a current
|
|
|
|
//second round add all others in window if they share a nation with a current
|
|
|
|
for(AbstractWorldObject trackChar : allInRange) { |
|
|
|
for(AbstractWorldObject trackChar : allInRange) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(trackChar.equals(playerCharacter) || !trackChar.isAlive() || !((PlayerCharacter)trackChar).isActive()) |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
Guild nation = ((AbstractCharacter) trackChar).guild.getNation(); |
|
|
|
Guild nation = ((AbstractCharacter) trackChar).guild.getNation(); |
|
|
|
if (allInRange.contains(trackChar) == true && nationsInRange.add(nation) == true && trackChars.contains(trackChar) == false) |
|
|
|
if (allInRange.contains(trackChar) == true && nationsInRange.add(nation) == true && trackChars.contains(trackChar) == false) |
|
|
|
trackChars.add((AbstractCharacter) trackChar); |
|
|
|
trackChars.add((AbstractCharacter) trackChar); |
|
|
|