track range changes
This commit is contained in:
@@ -1461,6 +1461,27 @@ public enum PowersManager {
|
|||||||
HashSet<AbstractCharacter> trackChars = RangeBasedAwo.getTrackList(
|
HashSet<AbstractCharacter> trackChars = RangeBasedAwo.getTrackList(
|
||||||
allTargets, playerCharacter, maxTargets);
|
allTargets, playerCharacter, maxTargets);
|
||||||
|
|
||||||
|
trackChars = new HashSet<>();
|
||||||
|
HashSet<AbstractWorldObject> allInRange = WorldGrid.getObjectsInRangePartial(playerCharacter.loc,MBServerStatics.CHARACTER_LOAD_RANGE,MBServerStatics.MASK_PLAYER);
|
||||||
|
ArrayList<Guild> nationsInRange = new ArrayList<>();
|
||||||
|
//first round to add players in range
|
||||||
|
for(AbstractWorldObject trackChar : allInRange){
|
||||||
|
if(allInRange.contains(trackChar)) {
|
||||||
|
trackChars.add((AbstractCharacter)trackChar);
|
||||||
|
Guild nation = ((AbstractCharacter)trackChar).guild.getNation();
|
||||||
|
if(nationsInRange.contains(nation) == false)
|
||||||
|
nationsInRange.add(nation);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//second round add all others in window if they share a nation with a current
|
||||||
|
for(AbstractWorldObject trackChar : allInRange) {
|
||||||
|
Guild nation = ((AbstractCharacter) trackChar).guild.getNation();
|
||||||
|
if (allInRange.contains(trackChar) == true && nationsInRange.add(nation) == true && trackChars.contains(trackChar) == false)
|
||||||
|
trackChars.add((AbstractCharacter) trackChar);
|
||||||
|
else if(((AbstractCharacter) trackChar).guild.getNation().equals(playerCharacter.guild.getNation()))
|
||||||
|
trackChars.add((AbstractCharacter) trackChar);
|
||||||
|
}
|
||||||
|
|
||||||
TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
|
TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
|
||||||
|
|
||||||
// send track window
|
// send track window
|
||||||
|
|||||||
Reference in New Issue
Block a user