Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 00:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix showing ban message box (#1826)

Browse Source 
* fix: getplayertoken ban message popup

* feat: insure no packet handle when banned

* feat: using session state instead of account
This commit is contained in:
Dang Hoang Phuc
2022-10-07 22:07:20 +07:00
committed by GitHub
parent 0b9cab5ad5
commit a520bc9416
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java
View File

@@ -4,6 +4,7 @@ import static emu.grasscutter.config.Configuration.*;
import java.util.Set;
import emu.grasscutter.game.Account;
import emu.grasscutter.server.event.game.ReceivePacketEvent;
import org.reflections.Reflections;
@@ -68,6 +69,9 @@ public class GameServerPacketHandler {
if (state != SessionState.WAITING_FOR_TOKEN) {
return;
}
} else if (state == SessionState.ACCOUNT_BANNED) {
session.close();
return;
} else if (opcode == PacketOpcodes.PlayerLoginReq) {
if (state != SessionState.WAITING_FOR_LOGIN) {
return;
@@ -83,7 +87,8 @@ public class GameServerPacketHandler {
}
// Invoke event.
ReceivePacketEvent event = new ReceivePacketEvent(session, opcode, payload); event.call();
ReceivePacketEvent event = new ReceivePacketEvent(session, opcode, payload);
event.call();
if (!event.isCanceled()) // If event is not canceled, continue.
handler.handle(session, header, event.getPacketData());
} catch (Exception ex) {

13
src/main/java/emu/grasscutter/server/game/GameSession.java
View File

@@ -100,6 +100,7 @@ public class GameSession implements GameSessionManager.KcpChannel {
Grasscutter.getLogger().info(sendOrRecv + ": " + PacketOpcodesUtils.getOpcodeName(opcode) + " (" + opcode + ")");
System.out.println(Utils.bytesToHex(payload));
}
public void send(BasePacket packet) {
// Test
if (packet.getOpcode() <= 0) {
@@ -135,11 +136,13 @@ public class GameSession implements GameSessionManager.KcpChannel {
logPacket("SEND", packet.getOpcode(), packet.getData());
}
}
default -> {}
default -> {
}
}
// Invoke event.
SendPacketEvent event = new SendPacketEvent(this, packet); event.call();
SendPacketEvent event = new SendPacketEvent(this, packet);
event.call();
if (!event.isCanceled()) { // If event is not cancelled, continue.
tunnel.writeData(event.getPacket().build());
}
@@ -211,7 +214,8 @@ public class GameSession implements GameSessionManager.KcpChannel {
logPacket("RECV", opcode, payload);
}
}
default -> {}
default -> {
}
}
// Handle
@@ -257,6 +261,7 @@ public class GameSession implements GameSessionManager.KcpChannel {
WAITING_FOR_TOKEN,
WAITING_FOR_LOGIN,
PICKING_CHARACTER,
ACTIVE
ACTIVE,
ACCOUNT_BANNED
}
}

8
src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
View File

@@ -67,7 +67,8 @@ public class HandlerGetPlayerTokenReq extends PacketHandler {
}
// Call creation event.
PlayerCreationEvent event = new PlayerCreationEvent(session, Player.class); event.call();
PlayerCreationEvent event = new PlayerCreationEvent(session, Player.class);
event.call();
// Get player.
Player player = DatabaseHelper.getPlayerByAccount(account, event.getPlayerClass());
@@ -87,8 +88,8 @@ public class HandlerGetPlayerTokenReq extends PacketHandler {
// Checks if the player is banned
if (session.getAccount().isBanned()) {
session.setState(SessionState.ACCOUNT_BANNED);
session.send(new PacketGetPlayerTokenRsp(session, 21, "FORBID_CHEATING_PLUGINS", session.getAccount().getBanEndTime()));
session.close();
return;
}
@@ -132,8 +133,7 @@ public class HandlerGetPlayerTokenReq extends PacketHandler {
session.send(new PacketGetPlayerTokenRsp(session, base64str, "bm90aGluZyBoZXJl"));
}
}
else {
} else {
// Send packet
session.send(new PacketGetPlayerTokenRsp(session));
}