MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

mine show in system chat updated numbers

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-11 23:41:24 -06:00
parent 8f2847a527
commit 457ed4f4e6
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Mine.java
+34 -18
View File
@@ -600,6 +600,7 @@ public class Mine extends AbstractGameObject {
Building building = BuildingManager.getBuilding(this.buildingID); Building building = BuildingManager.getBuilding(this.buildingID);
currentPlayers = WorldGrid.getObjectsInRangePartial(building.loc, Enum.CityBoundsType.ZONE.extents, MBServerStatics.MASK_PLAYER); currentPlayers = WorldGrid.getObjectsInRangePartial(building.loc, Enum.CityBoundsType.ZONE.extents, MBServerStatics.MASK_PLAYER);
this.totalPLayers = currentPlayers.size(); this.totalPLayers = currentPlayers.size();
boolean added = false;
for (AbstractWorldObject playerObject : currentPlayers) { for (AbstractWorldObject playerObject : currentPlayers) {
if (playerObject == null) if (playerObject == null)
@@ -607,49 +608,64 @@ public class Mine extends AbstractGameObject {
player = (PlayerCharacter) playerObject; player = (PlayerCharacter) playerObject;
Guild nation = player.getGuild().getNation(); Guild nation = player.getGuild().getNation();
if(nation == null)
return;
if(this.presentPlayers.containsKey(nation)) { if(this.presentPlayers.containsKey(nation)) {
if (this.presentPlayers.get(nation).contains(player) == false) if (this.presentPlayers.get(nation).contains(player) == false)
{ {
this.presentPlayers.get(nation).add(player); this.presentPlayers.get(nation).add(player);
added = true;
} }
} else { } else {
ArrayList<PlayerCharacter> present = new ArrayList<>(); ArrayList<PlayerCharacter> present = new ArrayList<>();
present.add(player); present.add(player);
this.presentPlayers.put(nation, present); this.presentPlayers.put(nation, present);
added = true;
} }
for(Guild guild : this.presentPlayers.keySet()) { if(added)
ChatManager.chatSystemInfo(player, "Guild: " + guild.getName() + " COUNT: " + presentPlayers.get(guild).size()); for(Guild guild : this.presentPlayers.keySet()) {
} ChatManager.chatSystemInfo(player, "Guild: " + guild.getName() + " COUNT: " + presentPlayers.get(guild).size());
}
} }
try { try {
onExit(); onExit(this.presentPlayers);
} catch (Exception e) { } catch (Exception e) {
Logger.error(e.getMessage()); Logger.error(e.getMessage());
} }
} }
private void onExit() { private void onExit(HashMap<Guild,ArrayList<PlayerCharacter>> checkList) {
ArrayList<PlayerCharacter> allPlayers = new ArrayList<>();
for(ArrayList<PlayerCharacter> players: presentPlayers.values()){
allPlayers.addAll(players);
}
boolean updated = false;
HashSet<AbstractWorldObject> currentPlayers; HashSet<AbstractWorldObject> currentPlayers;
PlayerCharacter player; PlayerCharacter player;
Building building = BuildingManager.getBuilding(this.buildingID); Building building = BuildingManager.getBuilding(this.buildingID);
currentPlayers = WorldGrid.getObjectsInRangePartial(building.loc, Enum.CityBoundsType.ZONE.extents, MBServerStatics.MASK_PLAYER); currentPlayers = WorldGrid.getObjectsInRangePartial(building.loc, Enum.CityBoundsType.ZONE.extents, MBServerStatics.MASK_PLAYER);
this.totalPLayers = currentPlayers.size(); this.totalPLayers = currentPlayers.size();
for (AbstractWorldObject playerObject : currentPlayers) { for (PlayerCharacter playerObject : allPlayers) {
if (playerObject == null) if (currentPlayers.contains(playerObject) == false) {
continue; Guild nation = playerObject.getGuild().getNation();
if (this.presentPlayers.containsKey(nation)) {
player = (PlayerCharacter) playerObject; if (this.presentPlayers.get(nation).contains(playerObject) == true) {
Guild nation = player.getGuild().getNation(); this.presentPlayers.get(nation).remove(playerObject);
if(this.presentPlayers.containsKey(nation)) { updated = true;
if (this.presentPlayers.get(nation).contains(player) == false) ChatManager.chatSystemInfo(playerObject,"Leaving Mine Vicinity");
{ }
this.presentPlayers.get(nation).remove(player);
} }
} }
for(Guild guild : this.presentPlayers.keySet()) { if(updated)
ChatManager.chatSystemInfo(player, "Guild: " + guild.getName() + " COUNT: " + presentPlayers.get(guild).size()); for (Guild guild : this.presentPlayers.keySet()) {
} ChatManager.chatSystemInfo(playerObject, "Guild: " + guild.getName() + " COUNT: " + presentPlayers.get(guild).size());
}
} }
} }
} }