Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check account state before getPlayerByAccountId() #2517

Closed
wants to merge 3 commits into from
+9 −9
Closed

check account state before getPlayerByAccountId() #2517

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e4b98b
check account state before getPlayer
Jun 6, 2024
8500144
A
issueMel Jun 6, 2024
d33b699
Merge remote-tracking branch 'origin/pr1' into pr1
issueMel Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex
// Set account
session.setAccount(account);

// 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()));
return;
}

// Check if player object exists in server
// NOTE: CHECKING MUST SITUATED HERE (BEFORE getPlayerByUid)! because to save firstly ,to load
// secondly !!!
Expand Down Expand Up @@ -93,15 +102,6 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex
// Set player object for session
session.setPlayer(player);

// 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()));
return;
}

// Load player from database
player.loadFromDatabase();

Expand Down