Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleCharacter

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:09:45 +02:00
parent 46bd0570d7
commit 7dc3a2159a
379 changed files with 3418 additions and 3373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/server/handlers/login/ViewAllCharHandler.java
View File

@@ -21,7 +21,7 @@
*/
package net.server.handlers.login;
import client.MapleCharacter;
import client.Character;
import client.MapleClient;
import config.YamlConfig;
import net.AbstractPacketHandler;
@@ -42,16 +42,16 @@ public final class ViewAllCharHandler extends AbstractPacketHandler {
}
int accountId = c.getAccID();
Pair<Pair<Integer, List<MapleCharacter>>, List<Pair<Integer, List<MapleCharacter>>>> loginBlob = Server.getInstance().loadAccountCharlist(accountId, c.getVisibleWorlds());
Pair<Pair<Integer, List<Character>>, List<Pair<Integer, List<Character>>>> loginBlob = Server.getInstance().loadAccountCharlist(accountId, c.getVisibleWorlds());
List<Pair<Integer, List<MapleCharacter>>> worldChars = loginBlob.getRight();
List<Pair<Integer, List<Character>>> worldChars = loginBlob.getRight();
int chrTotal = loginBlob.getLeft().getLeft();
List<MapleCharacter> lastwchars = loginBlob.getLeft().getRight();
List<Character> lastwchars = loginBlob.getLeft().getRight();
if (chrTotal > 9) {
int padRight = chrTotal % 3;
if (padRight > 0 && lastwchars != null) {
MapleCharacter chr = lastwchars.get(lastwchars.size() - 1);
Character chr = lastwchars.get(lastwchars.size() - 1);
for(int i = padRight; i < 3; i++) { // filling the remaining slots with the last character loaded
chrTotal++;
@@ -64,7 +64,7 @@ public final class ViewAllCharHandler extends AbstractPacketHandler {
int unk = charsSize + (3 - charsSize % 3); //rowSize?
c.sendPacket(PacketCreator.showAllCharacter(charsSize, unk));
for (Pair<Integer, List<MapleCharacter>> wchars : worldChars) {
for (Pair<Integer, List<Character>> wchars : worldChars) {
c.sendPacket(PacketCreator.showAllCharacterInfo(wchars.getLeft(), wchars.getRight(), YamlConfig.config.server.ENABLE_PIC && !c.canBypassPic()));
}
} catch (Exception e) {