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

Small refactor of disconnectInternal for readability

Browse Source
This commit is contained in:
P0nk
2024-09-13 23:23:35 +02:00
parent 1b6c0167de
commit 758347f7bc
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/service/TransitionService.java
View File

@@ -108,14 +108,8 @@ public class TransitionService {
} }
private void disconnectInternal(Client c, boolean shutdown) { private void disconnectInternal(Client c, boolean shutdown) {
var chr = c.getPlayer(); final var chr = c.getPlayer();
if (chr != null && chr.isLoggedin() && chr.getClient() != null) { if (chr != null && chr.isLoggedin() && chr.getClient() != null) {
final int messengerid = chr.getMessenger() == null ? 0 : chr.getMessenger().getId();
final BuddyList bl = chr.getBuddylist();
final MessengerCharacter messengerChr = new MessengerCharacter(chr, 0);
final GuildCharacter guildChr = chr.getMGC();
final Guild guild = chr.getGuild();
chr.cancelMagicDoor(); chr.cancelMagicDoor();
final World wserv = c.getWorldServer(); // obviously wserv is NOT null if this chr was online on it final World wserv = c.getWorldServer(); // obviously wserv is NOT null if this chr was online on it
@@ -125,18 +119,22 @@ public class TransitionService {
final int channel = c.getChannel(); final int channel = c.getChannel();
if (!(channel == LoginServer.CHANNEL_ID || shutdown)) { if (!(channel == LoginServer.CHANNEL_ID || shutdown)) {
if (!c.isInTransition()) { // meaning not changing channels if (!c.isInTransition()) { // meaning not changing channels
final int messengerid = chr.getMessenger() == null ? 0 : chr.getMessenger().getId();
if (messengerid > 0) { if (messengerid > 0) {
wserv.leaveMessenger(messengerid, messengerChr); wserv.leaveMessenger(messengerid, new MessengerCharacter(chr, 0));
} }
chr.forfeitExpirableQuests(); //This is for those quests that you have to stay logged in for a certain amount of time chr.forfeitExpirableQuests(); //This is for those quests that you have to stay logged in for a certain amount of time
Guild guild = chr.getGuild();
if (guild != null) { if (guild != null) {
final Server server = Server.getInstance(); final Server server = Server.getInstance();
server.setGuildMemberOnline(chr, false, chr.getClient().getChannel()); server.setGuildMemberOnline(chr, false, chr.getClient().getChannel());
chr.sendPacket(GuildPackets.showGuildInfo(chr)); chr.sendPacket(GuildPackets.showGuildInfo(chr));
} }
if (bl != null) {
BuddyList buddyList = chr.getBuddylist();
if (buddyList != null) {
wserv.loggedOff(chr.getName(), chr.getId(), channel, chr.getBuddylist().getBuddyIds()); wserv.loggedOff(chr.getName(), chr.getId(), channel, chr.getBuddylist().getBuddyIds());
} }
} }
@@ -145,6 +143,7 @@ public class TransitionService {
log.error("Account stuck", e); log.error("Account stuck", e);
} finally { } finally {
if (!c.isInTransition()) { if (!c.isInTransition()) {
final GuildCharacter guildChr = chr.getMGC();
if (guildChr != null) { if (guildChr != null) {
guildChr.setCharacter(null); guildChr.setCharacter(null);
} }