lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed ClassRank using same value as RaceRank.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2021-12-22 04:34:39 +00:00
parent b18c8762bd
commit 05670928de
12 changed files with 78 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -64,8 +64,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot
packet.writeD(snapshot.getInt("classRank")); // class rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot
packet.writeD(player.getInt("classRank")); // class rank snapshot
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);

22
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -433,20 +433,20 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(i); // server rank packet.writeD(i); // server rank
if (_snapshotList.size() > 0) if (_snapshotList.size() > 0)
{ {
final Map<Integer, StatSet> snapshotRaceList = new ConcurrentHashMap<>(); final Map<Integer, StatSet> snapshotClassList = new ConcurrentHashMap<>();
int j = 1; int j = 1;
for (Integer id2 : _snapshotList.keySet()) for (Integer id2 : _snapshotList.keySet())
{ {
final StatSet snapshot = _snapshotList.get(id2); final StatSet snapshot = _snapshotList.get(id2);
if (_class == snapshot.getInt("classId")) if (_class == snapshot.getInt("classId"))
{ {
snapshotRaceList.put(j, _snapshotList.get(id2)); snapshotClassList.put(j, _snapshotList.get(id2));
j++; j++;
} }
} }
for (Integer id2 : snapshotRaceList.keySet()) for (Integer id2 : snapshotClassList.keySet())
{ {
final StatSet snapshot = snapshotRaceList.get(id2); final StatSet snapshot = snapshotClassList.get(id2);
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
@@ -468,25 +468,27 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
else else
{ {
boolean found = false; boolean found = false;
final Map<Integer, StatSet> raceList = new ConcurrentHashMap<>();
final Map<Integer, StatSet> classList = new ConcurrentHashMap<>();
int i = 1; int i = 1;
for (Integer id : _playerList.keySet()) for (Integer id : _playerList.keySet())
{ {
final StatSet set = _playerList.get(id); final StatSet set = _playerList.get(id);
if (_player.getBaseClass() == set.getInt("classId")) if (_player.getBaseClass() == set.getInt("classId"))
{ {
raceList.put(i, _playerList.get(id)); classList.put(i, _playerList.get(id));
i++; i++;
} }
} }
for (Integer id : raceList.keySet())
for (Integer id : classList.keySet())
{ {
final StatSet player = raceList.get(id); final StatSet player = classList.get(id);
if (player.getInt("charId") == _player.getObjectId()) if (player.getInt("charId") == _player.getObjectId())
{ {
found = true; found = true;
final int first = id > 10 ? (id - 9) : 1; final int first = id > 10 ? (id - 9) : 1;
final int last = raceList.size() >= (id + 10) ? id + 10 : id + (raceList.size() - id); final int last = classList.size() >= (id + 10) ? id + 10 : id + (classList.size() - id);
if (first == 1) if (first == 1)
{ {
packet.writeD(last - (first - 1)); packet.writeD(last - (first - 1));
@@ -497,7 +499,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
} }
for (int id2 = first; id2 <= last; id2++) for (int id2 = first; id2 <= last; id2++)
{ {
final StatSet plr = raceList.get(id2); final StatSet plr = classList.get(id2);
packet.writeString(plr.getString("name")); packet.writeString(plr.getString("name"));
packet.writeString(plr.getString("clanName")); packet.writeString(plr.getString("clanName"));
packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("level"));

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -64,8 +64,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot
packet.writeD(snapshot.getInt("classRank")); // class rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot
packet.writeD(player.getInt("classRank")); // class rank snapshot
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);

22
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -433,20 +433,20 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(i); // server rank packet.writeD(i); // server rank
if (_snapshotList.size() > 0) if (_snapshotList.size() > 0)
{ {
final Map<Integer, StatSet> snapshotRaceList = new ConcurrentHashMap<>(); final Map<Integer, StatSet> snapshotClassList = new ConcurrentHashMap<>();
int j = 1; int j = 1;
for (Integer id2 : _snapshotList.keySet()) for (Integer id2 : _snapshotList.keySet())
{ {
final StatSet snapshot = _snapshotList.get(id2); final StatSet snapshot = _snapshotList.get(id2);
if (_class == snapshot.getInt("classId")) if (_class == snapshot.getInt("classId"))
{ {
snapshotRaceList.put(j, _snapshotList.get(id2)); snapshotClassList.put(j, _snapshotList.get(id2));
j++; j++;
} }
} }
for (Integer id2 : snapshotRaceList.keySet()) for (Integer id2 : snapshotClassList.keySet())
{ {
final StatSet snapshot = snapshotRaceList.get(id2); final StatSet snapshot = snapshotClassList.get(id2);
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
@@ -468,25 +468,27 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
else else
{ {
boolean found = false; boolean found = false;
final Map<Integer, StatSet> raceList = new ConcurrentHashMap<>();
final Map<Integer, StatSet> classList = new ConcurrentHashMap<>();
int i = 1; int i = 1;
for (Integer id : _playerList.keySet()) for (Integer id : _playerList.keySet())
{ {
final StatSet set = _playerList.get(id); final StatSet set = _playerList.get(id);
if (_player.getBaseClass() == set.getInt("classId")) if (_player.getBaseClass() == set.getInt("classId"))
{ {
raceList.put(i, _playerList.get(id)); classList.put(i, _playerList.get(id));
i++; i++;
} }
} }
for (Integer id : raceList.keySet())
for (Integer id : classList.keySet())
{ {
final StatSet player = raceList.get(id); final StatSet player = classList.get(id);
if (player.getInt("charId") == _player.getObjectId()) if (player.getInt("charId") == _player.getObjectId())
{ {
found = true; found = true;
final int first = id > 10 ? (id - 9) : 1; final int first = id > 10 ? (id - 9) : 1;
final int last = raceList.size() >= (id + 10) ? id + 10 : id + (raceList.size() - id); final int last = classList.size() >= (id + 10) ? id + 10 : id + (classList.size() - id);
if (first == 1) if (first == 1)
{ {
packet.writeD(last - (first - 1)); packet.writeD(last - (first - 1));
@@ -497,7 +499,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
} }
for (int id2 = first; id2 <= last; id2++) for (int id2 = first; id2 <= last; id2++)
{ {
final StatSet plr = raceList.get(id2); final StatSet plr = classList.get(id2);
packet.writeString(plr.getString("name")); packet.writeString(plr.getString("name"));
packet.writeString(plr.getString("clanName")); packet.writeString(plr.getString("clanName"));
packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("level"));

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -64,8 +64,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot
packet.writeD(snapshot.getInt("classRank")); // class rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot
packet.writeD(player.getInt("classRank")); // class rank snapshot
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);

22
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -433,20 +433,20 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(i); // server rank packet.writeD(i); // server rank
if (_snapshotList.size() > 0) if (_snapshotList.size() > 0)
{ {
final Map<Integer, StatSet> snapshotRaceList = new ConcurrentHashMap<>(); final Map<Integer, StatSet> snapshotClassList = new ConcurrentHashMap<>();
int j = 1; int j = 1;
for (Integer id2 : _snapshotList.keySet()) for (Integer id2 : _snapshotList.keySet())
{ {
final StatSet snapshot = _snapshotList.get(id2); final StatSet snapshot = _snapshotList.get(id2);
if (_class == snapshot.getInt("classId")) if (_class == snapshot.getInt("classId"))
{ {
snapshotRaceList.put(j, _snapshotList.get(id2)); snapshotClassList.put(j, _snapshotList.get(id2));
j++; j++;
} }
} }
for (Integer id2 : snapshotRaceList.keySet()) for (Integer id2 : snapshotClassList.keySet())
{ {
final StatSet snapshot = snapshotRaceList.get(id2); final StatSet snapshot = snapshotClassList.get(id2);
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
@@ -468,25 +468,27 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
else else
{ {
boolean found = false; boolean found = false;
final Map<Integer, StatSet> raceList = new ConcurrentHashMap<>();
final Map<Integer, StatSet> classList = new ConcurrentHashMap<>();
int i = 1; int i = 1;
for (Integer id : _playerList.keySet()) for (Integer id : _playerList.keySet())
{ {
final StatSet set = _playerList.get(id); final StatSet set = _playerList.get(id);
if (_player.getBaseClass() == set.getInt("classId")) if (_player.getBaseClass() == set.getInt("classId"))
{ {
raceList.put(i, _playerList.get(id)); classList.put(i, _playerList.get(id));
i++; i++;
} }
} }
for (Integer id : raceList.keySet())
for (Integer id : classList.keySet())
{ {
final StatSet player = raceList.get(id); final StatSet player = classList.get(id);
if (player.getInt("charId") == _player.getObjectId()) if (player.getInt("charId") == _player.getObjectId())
{ {
found = true; found = true;
final int first = id > 10 ? (id - 9) : 1; final int first = id > 10 ? (id - 9) : 1;
final int last = raceList.size() >= (id + 10) ? id + 10 : id + (raceList.size() - id); final int last = classList.size() >= (id + 10) ? id + 10 : id + (classList.size() - id);
if (first == 1) if (first == 1)
{ {
packet.writeD(last - (first - 1)); packet.writeD(last - (first - 1));
@@ -497,7 +499,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
} }
for (int id2 = first; id2 <= last; id2++) for (int id2 = first; id2 <= last; id2++)
{ {
final StatSet plr = raceList.get(id2); final StatSet plr = classList.get(id2);
packet.writeString(plr.getString("name")); packet.writeString(plr.getString("name"));
packet.writeString(plr.getString("clanName")); packet.writeString(plr.getString("clanName"));
packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("level"));

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -64,8 +64,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot
packet.writeD(snapshot.getInt("classRank")); // class rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot
packet.writeD(player.getInt("classRank")); // class rank snapshot
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);

22
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -433,20 +433,20 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(i); // server rank packet.writeD(i); // server rank
if (_snapshotList.size() > 0) if (_snapshotList.size() > 0)
{ {
final Map<Integer, StatSet> snapshotRaceList = new ConcurrentHashMap<>(); final Map<Integer, StatSet> snapshotClassList = new ConcurrentHashMap<>();
int j = 1; int j = 1;
for (Integer id2 : _snapshotList.keySet()) for (Integer id2 : _snapshotList.keySet())
{ {
final StatSet snapshot = _snapshotList.get(id2); final StatSet snapshot = _snapshotList.get(id2);
if (_class == snapshot.getInt("classId")) if (_class == snapshot.getInt("classId"))
{ {
snapshotRaceList.put(j, _snapshotList.get(id2)); snapshotClassList.put(j, _snapshotList.get(id2));
j++; j++;
} }
} }
for (Integer id2 : snapshotRaceList.keySet()) for (Integer id2 : snapshotClassList.keySet())
{ {
final StatSet snapshot = snapshotRaceList.get(id2); final StatSet snapshot = snapshotClassList.get(id2);
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
@@ -468,25 +468,27 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
else else
{ {
boolean found = false; boolean found = false;
final Map<Integer, StatSet> raceList = new ConcurrentHashMap<>();
final Map<Integer, StatSet> classList = new ConcurrentHashMap<>();
int i = 1; int i = 1;
for (Integer id : _playerList.keySet()) for (Integer id : _playerList.keySet())
{ {
final StatSet set = _playerList.get(id); final StatSet set = _playerList.get(id);
if (_player.getBaseClass() == set.getInt("classId")) if (_player.getBaseClass() == set.getInt("classId"))
{ {
raceList.put(i, _playerList.get(id)); classList.put(i, _playerList.get(id));
i++; i++;
} }
} }
for (Integer id : raceList.keySet())
for (Integer id : classList.keySet())
{ {
final StatSet player = raceList.get(id); final StatSet player = classList.get(id);
if (player.getInt("charId") == _player.getObjectId()) if (player.getInt("charId") == _player.getObjectId())
{ {
found = true; found = true;
final int first = id > 10 ? (id - 9) : 1; final int first = id > 10 ? (id - 9) : 1;
final int last = raceList.size() >= (id + 10) ? id + 10 : id + (raceList.size() - id); final int last = classList.size() >= (id + 10) ? id + 10 : id + (classList.size() - id);
if (first == 1) if (first == 1)
{ {
packet.writeD(last - (first - 1)); packet.writeD(last - (first - 1));
@@ -497,7 +499,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
} }
for (int id2 = first; id2 <= last; id2++) for (int id2 = first; id2 <= last; id2++)
{ {
final StatSet plr = raceList.get(id2); final StatSet plr = classList.get(id2);
packet.writeString(plr.getString("name")); packet.writeString(plr.getString("name"));
packet.writeString(plr.getString("clanName")); packet.writeString(plr.getString("clanName"));
packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("level"));

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -64,8 +64,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot
packet.writeD(snapshot.getInt("classRank")); // class rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot
packet.writeD(player.getInt("classRank")); // class rank snapshot
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);

22
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -433,20 +433,20 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(i); // server rank packet.writeD(i); // server rank
if (_snapshotList.size() > 0) if (_snapshotList.size() > 0)
{ {
final Map<Integer, StatSet> snapshotRaceList = new ConcurrentHashMap<>(); final Map<Integer, StatSet> snapshotClassList = new ConcurrentHashMap<>();
int j = 1; int j = 1;
for (Integer id2 : _snapshotList.keySet()) for (Integer id2 : _snapshotList.keySet())
{ {
final StatSet snapshot = _snapshotList.get(id2); final StatSet snapshot = _snapshotList.get(id2);
if (_class == snapshot.getInt("classId")) if (_class == snapshot.getInt("classId"))
{ {
snapshotRaceList.put(j, _snapshotList.get(id2)); snapshotClassList.put(j, _snapshotList.get(id2));
j++; j++;
} }
} }
for (Integer id2 : snapshotRaceList.keySet()) for (Integer id2 : snapshotClassList.keySet())
{ {
final StatSet snapshot = snapshotRaceList.get(id2); final StatSet snapshot = snapshotClassList.get(id2);
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
@@ -468,25 +468,27 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
else else
{ {
boolean found = false; boolean found = false;
final Map<Integer, StatSet> raceList = new ConcurrentHashMap<>();
final Map<Integer, StatSet> classList = new ConcurrentHashMap<>();
int i = 1; int i = 1;
for (Integer id : _playerList.keySet()) for (Integer id : _playerList.keySet())
{ {
final StatSet set = _playerList.get(id); final StatSet set = _playerList.get(id);
if (_player.getBaseClass() == set.getInt("classId")) if (_player.getBaseClass() == set.getInt("classId"))
{ {
raceList.put(i, _playerList.get(id)); classList.put(i, _playerList.get(id));
i++; i++;
} }
} }
for (Integer id : raceList.keySet())
for (Integer id : classList.keySet())
{ {
final StatSet player = raceList.get(id); final StatSet player = classList.get(id);
if (player.getInt("charId") == _player.getObjectId()) if (player.getInt("charId") == _player.getObjectId())
{ {
found = true; found = true;
final int first = id > 10 ? (id - 9) : 1; final int first = id > 10 ? (id - 9) : 1;
final int last = raceList.size() >= (id + 10) ? id + 10 : id + (raceList.size() - id); final int last = classList.size() >= (id + 10) ? id + 10 : id + (classList.size() - id);
if (first == 1) if (first == 1)
{ {
packet.writeD(last - (first - 1)); packet.writeD(last - (first - 1));
@@ -497,7 +499,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
} }
for (int id2 = first; id2 <= last; id2++) for (int id2 = first; id2 <= last; id2++)
{ {
final StatSet plr = raceList.get(id2); final StatSet plr = classList.get(id2);
packet.writeString(plr.getString("name")); packet.writeString(plr.getString("name"));
packet.writeString(plr.getString("clanName")); packet.writeString(plr.getString("clanName"));
packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("level"));

2
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -64,8 +64,8 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot
packet.writeD(snapshot.getInt("classRank")); // class rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot
packet.writeD(player.getInt("classRank")); // class rank snapshot
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);
packet.writeD(0); packet.writeD(0);

22
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -433,20 +433,20 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(i); // server rank packet.writeD(i); // server rank
if (_snapshotList.size() > 0) if (_snapshotList.size() > 0)
{ {
final Map<Integer, StatSet> snapshotRaceList = new ConcurrentHashMap<>(); final Map<Integer, StatSet> snapshotClassList = new ConcurrentHashMap<>();
int j = 1; int j = 1;
for (Integer id2 : _snapshotList.keySet()) for (Integer id2 : _snapshotList.keySet())
{ {
final StatSet snapshot = _snapshotList.get(id2); final StatSet snapshot = _snapshotList.get(id2);
if (_class == snapshot.getInt("classId")) if (_class == snapshot.getInt("classId"))
{ {
snapshotRaceList.put(j, _snapshotList.get(id2)); snapshotClassList.put(j, _snapshotList.get(id2));
j++; j++;
} }
} }
for (Integer id2 : snapshotRaceList.keySet()) for (Integer id2 : snapshotClassList.keySet())
{ {
final StatSet snapshot = snapshotRaceList.get(id2); final StatSet snapshot = snapshotClassList.get(id2);
if (player.getInt("charId") == snapshot.getInt("charId")) if (player.getInt("charId") == snapshot.getInt("charId"))
{ {
packet.writeD(id2); // server rank snapshot packet.writeD(id2); // server rank snapshot
@@ -468,25 +468,27 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
else else
{ {
boolean found = false; boolean found = false;
final Map<Integer, StatSet> raceList = new ConcurrentHashMap<>();
final Map<Integer, StatSet> classList = new ConcurrentHashMap<>();
int i = 1; int i = 1;
for (Integer id : _playerList.keySet()) for (Integer id : _playerList.keySet())
{ {
final StatSet set = _playerList.get(id); final StatSet set = _playerList.get(id);
if (_player.getBaseClass() == set.getInt("classId")) if (_player.getBaseClass() == set.getInt("classId"))
{ {
raceList.put(i, _playerList.get(id)); classList.put(i, _playerList.get(id));
i++; i++;
} }
} }
for (Integer id : raceList.keySet())
for (Integer id : classList.keySet())
{ {
final StatSet player = raceList.get(id); final StatSet player = classList.get(id);
if (player.getInt("charId") == _player.getObjectId()) if (player.getInt("charId") == _player.getObjectId())
{ {
found = true; found = true;
final int first = id > 10 ? (id - 9) : 1; final int first = id > 10 ? (id - 9) : 1;
final int last = raceList.size() >= (id + 10) ? id + 10 : id + (raceList.size() - id); final int last = classList.size() >= (id + 10) ? id + 10 : id + (classList.size() - id);
if (first == 1) if (first == 1)
{ {
packet.writeD(last - (first - 1)); packet.writeD(last - (first - 1));
@@ -497,7 +499,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
} }
for (int id2 = first; id2 <= last; id2++) for (int id2 = first; id2 <= last; id2++)
{ {
final StatSet plr = raceList.get(id2); final StatSet plr = classList.get(id2);
packet.writeString(plr.getString("name")); packet.writeString(plr.getString("name"));
packet.writeString(plr.getString("clanName")); packet.writeString(plr.getString("clanName"));
packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("level"));