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

Extract "char list" from Client to handler

Browse Source
This commit is contained in:
P0nk
2023-08-06 21:14:32 +02:00
parent bbee8d7caa
commit f6d06ba82a
3 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/tools/PacketCreator.java
View File

@@ -859,14 +859,11 @@ public class PacketCreator {
* <br> 17: Wrong gateway or personal info<br>
* <br> 21: Verify account via email<br>
*/
public static Packet getCharList(Client c, int serverId, int status) {
public static Packet getCharList(Client c, List<Character> chars, int status) {
final OutPacket p = OutPacket.create(SendOpcode.CHARLIST);
p.writeByte(status);
List<Character> chars = c.loadCharacters(serverId);
p.writeByte((byte) chars.size());
for (Character chr : chars) {
addCharEntry(p, chr, false);
}
chars.forEach(chr -> addCharEntry(p, chr, false));
p.writeByte(YamlConfig.config.server.ENABLE_PIC && !c.canBypassPic() ? (c.getPic() == null || c.getPic().equals("") ? 0 : 1) : 2);
p.writeInt(YamlConfig.config.server.COLLECTIVE_CHARSLOT ? chars.size() + c.getAvailableCharacterSlots() : c.getCharacterSlots());