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

Disconnect client with TransitionService

Browse Source
This commit is contained in:
P0nk
2023-08-10 21:58:26 +02:00
parent d5682a5f65
commit cb31121fe7
16 changed files with 83 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/client/command/commands/gm2/DcCommand.java
View File

@@ -41,14 +41,15 @@ public class DcCommand extends Command {
return;
}
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
String chrName = params[0];
Character victim = c.getWorldServer().getPlayerStorage().getCharacterByName(chrName);
if (victim == null) {
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
victim = c.getChannelServer().getPlayerStorage().getCharacterByName(chrName);
if (victim == null) {
victim = player.getMap().getCharacterByName(params[0]);
victim = player.getMap().getCharacterByName(chrName);
if (victim != null) {
try {//sometimes bugged because the map = null
victim.getClient().disconnect(true, false);
ctx.transitionService().disconnect(victim.getClient(), true, false);
player.getMap().removePlayer(victim);
} catch (Exception e) {
e.printStackTrace();
@@ -61,6 +62,6 @@ public class DcCommand extends Command {
if (player.gmLevel() < victim.gmLevel()) {
victim = player;
}
victim.getClient().disconnect(false, false);
ctx.transitionService().disconnect(victim.getClient(), false, false);
}
}

6
src/main/java/client/command/commands/gm3/BanCommand.java
View File

@@ -35,6 +35,7 @@ import tools.PacketCreator;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.concurrent.TimeUnit;
public class BanCommand extends Command {
{
@@ -76,7 +77,10 @@ public class BanCommand extends Command {
target.yellowMessage("Reason: " + reason);
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
final Character rip = target;
TimerManager.getInstance().schedule(() -> rip.getClient().disconnect(false, false), 5000); //5 Seconds
TimerManager.getInstance().schedule(
() -> ctx.transitionService().disconnect(rip.getClient(), false, false),
TimeUnit.SECONDS.toMillis(5)
);
Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "[RIP]: " + ign + " has been banned."));
} else if (Character.ban(ign, reason, false)) {
c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));

2
src/main/java/client/command/commands/gm6/DCAllCommand.java
View File

@@ -41,7 +41,7 @@ public class DCAllCommand extends Command {
for (World world : Server.getInstance().getWorlds()) {
for (Character chr : world.getPlayerStorage().getAllCharacters()) {
if (!chr.isGM()) {
chr.getClient().disconnect(false, false);
ctx.transitionService().disconnect(chr.getClient(), false, false);
}
}
}