Fix Lua require, Fix monster abilities & Fix ServerLuaCall

This commit is contained in:
KingRainbow44
2023-08-27 02:39:56 -04:00
Unverified
parent 49c1daede4
commit 1844cb43f7
15 changed files with 303 additions and 165 deletions
@@ -1,8 +1,6 @@
package emu.grasscutter.server.packet.recv;
import static emu.grasscutter.config.Configuration.ACCOUNT;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.*;
import emu.grasscutter.database.DatabaseHelper;
import emu.grasscutter.game.player.Player;
import emu.grasscutter.net.packet.*;
@@ -13,9 +11,12 @@ import emu.grasscutter.server.game.GameSession.SessionState;
import emu.grasscutter.server.packet.send.PacketGetPlayerTokenRsp;
import emu.grasscutter.utils.*;
import emu.grasscutter.utils.helpers.ByteHelper;
import javax.crypto.Cipher;
import java.nio.ByteBuffer;
import java.security.Signature;
import javax.crypto.Cipher;
import static emu.grasscutter.config.Configuration.ACCOUNT;
@Opcodes(PacketOpcodes.GetPlayerTokenReq)
public class HandlerGetPlayerTokenReq extends PacketHandler {
@@ -28,9 +29,15 @@ public class HandlerGetPlayerTokenReq extends PacketHandler {
var account = DispatchUtils.authenticate(accountId, req.getAccountToken());
// Check the account.
if (account == null) {
if (account == null && !DebugConstants.ACCEPT_CLIENT_TOKEN) {
session.close();
return;
} else if (account == null && DebugConstants.ACCEPT_CLIENT_TOKEN) {
account = DispatchUtils.getAccountById(accountId);
if (account == null) {
session.close();
return;
}
}
// Set account