mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-21 19:34:42 +01:00
Run spotlessApply
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
package emu.grasscutter.server.game;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.GAME_INFO;
|
||||
import static emu.grasscutter.utils.Language.translate;
|
||||
|
||||
import emu.grasscutter.GameConstants;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.database.DatabaseHelper;
|
||||
@@ -34,18 +37,14 @@ import emu.grasscutter.server.event.internal.ServerStopEvent;
|
||||
import emu.grasscutter.server.event.types.ServerEvent;
|
||||
import emu.grasscutter.server.scheduler.ServerTaskScheduler;
|
||||
import emu.grasscutter.task.TaskMap;
|
||||
import kcp.highway.ChannelConfig;
|
||||
import kcp.highway.KcpServer;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
import java.time.Instant;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.GAME_INFO;
|
||||
import static emu.grasscutter.utils.Language.translate;
|
||||
import kcp.highway.ChannelConfig;
|
||||
import kcp.highway.KcpServer;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public final class GameServer extends KcpServer {
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
package emu.grasscutter.server.http.dispatch;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.*;
|
||||
|
||||
import com.google.protobuf.ByteString;
|
||||
import emu.grasscutter.GameConstants;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.Grasscutter.ServerRunMode;
|
||||
import emu.grasscutter.net.proto.QueryRegionListHttpRspOuterClass.QueryRegionListHttpRsp;
|
||||
import emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp;
|
||||
import emu.grasscutter.net.proto.RegionSimpleInfoOuterClass.RegionSimpleInfo;
|
||||
import emu.grasscutter.net.proto.QueryRegionListHttpRspOuterClass.QueryRegionListHttpRsp;
|
||||
import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
|
||||
import emu.grasscutter.net.proto.RegionSimpleInfoOuterClass.RegionSimpleInfo;
|
||||
import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
|
||||
import emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo;
|
||||
import emu.grasscutter.server.event.dispatch.QueryAllRegionsEvent;
|
||||
@@ -18,23 +20,13 @@ import emu.grasscutter.utils.Crypto;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import io.javalin.Javalin;
|
||||
import io.javalin.http.Context;
|
||||
|
||||
import java.time.Instant;
|
||||
import javax.crypto.Cipher;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.security.Signature;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.*;
|
||||
import static emu.grasscutter.utils.Language.translate;
|
||||
|
||||
/**
|
||||
* Handles requests related to region queries.
|
||||
*/
|
||||
/** Handles requests related to region queries. */
|
||||
public final class RegionHandler implements Router {
|
||||
private static final Map<String, RegionData> regions = new ConcurrentHashMap<>();
|
||||
private static String regionListResponse;
|
||||
@@ -48,13 +40,15 @@ public final class RegionHandler implements Router {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Configures region data according to configuration.
|
||||
*/
|
||||
/** Configures region data according to configuration. */
|
||||
private void initialize() {
|
||||
String dispatchDomain = "http" + (HTTP_ENCRYPTION.useInRouting ? "s" : "") + "://"
|
||||
+ lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress) + ":"
|
||||
+ lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort);
|
||||
String dispatchDomain =
|
||||
"http"
|
||||
+ (HTTP_ENCRYPTION.useInRouting ? "s" : "")
|
||||
+ "://"
|
||||
+ lr(HTTP_INFO.accessAddress, HTTP_INFO.bindAddress)
|
||||
+ ":"
|
||||
+ lr(HTTP_INFO.accessPort, HTTP_INFO.bindPort);
|
||||
|
||||
// Create regions.
|
||||
List<RegionSimpleInfo> servers = new ArrayList<>();
|
||||
@@ -62,61 +56,84 @@ public final class RegionHandler implements Router {
|
||||
|
||||
var configuredRegions = new ArrayList<>(List.of(DISPATCH_INFO.regions));
|
||||
if (SERVER.runMode != ServerRunMode.HYBRID && configuredRegions.size() == 0) {
|
||||
Grasscutter.getLogger().error("[Dispatch] There are no game servers available. Exiting due to unplayable state.");
|
||||
Grasscutter.getLogger()
|
||||
.error(
|
||||
"[Dispatch] There are no game servers available. Exiting due to unplayable state.");
|
||||
System.exit(1);
|
||||
} else if (configuredRegions.size() == 0)
|
||||
configuredRegions.add(new Region("os_usa", DISPATCH_INFO.defaultName,
|
||||
lr(GAME_INFO.accessAddress, GAME_INFO.bindAddress),
|
||||
lr(GAME_INFO.accessPort, GAME_INFO.bindPort)));
|
||||
configuredRegions.add(
|
||||
new Region(
|
||||
"os_usa",
|
||||
DISPATCH_INFO.defaultName,
|
||||
lr(GAME_INFO.accessAddress, GAME_INFO.bindAddress),
|
||||
lr(GAME_INFO.accessPort, GAME_INFO.bindPort)));
|
||||
|
||||
configuredRegions.forEach(region -> {
|
||||
if (usedNames.contains(region.Name)) {
|
||||
Grasscutter.getLogger().error("Region name already in use.");
|
||||
return;
|
||||
}
|
||||
configuredRegions.forEach(
|
||||
region -> {
|
||||
if (usedNames.contains(region.Name)) {
|
||||
Grasscutter.getLogger().error("Region name already in use.");
|
||||
return;
|
||||
}
|
||||
|
||||
// Create a region identifier.
|
||||
var identifier = RegionSimpleInfo.newBuilder()
|
||||
.setName(region.Name).setTitle(region.Title).setType("DEV_PUBLIC")
|
||||
.setDispatchUrl(dispatchDomain + "/query_cur_region/" + region.Name)
|
||||
.build();
|
||||
usedNames.add(region.Name); servers.add(identifier);
|
||||
// Create a region identifier.
|
||||
var identifier =
|
||||
RegionSimpleInfo.newBuilder()
|
||||
.setName(region.Name)
|
||||
.setTitle(region.Title)
|
||||
.setType("DEV_PUBLIC")
|
||||
.setDispatchUrl(dispatchDomain + "/query_cur_region/" + region.Name)
|
||||
.build();
|
||||
usedNames.add(region.Name);
|
||||
servers.add(identifier);
|
||||
|
||||
// Create a region info object.
|
||||
var regionInfo = RegionInfo.newBuilder()
|
||||
.setGateserverIp(region.Ip).setGateserverPort(region.Port)
|
||||
.setSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
|
||||
.build();
|
||||
// Create an updated region query.
|
||||
var updatedQuery = QueryCurrRegionHttpRsp.newBuilder().setRegionInfo(regionInfo).build();
|
||||
regions.put(region.Name, new RegionData(updatedQuery, Utils.base64Encode(updatedQuery.toByteString().toByteArray())));
|
||||
});
|
||||
// Create a region info object.
|
||||
var regionInfo =
|
||||
RegionInfo.newBuilder()
|
||||
.setGateserverIp(region.Ip)
|
||||
.setGateserverPort(region.Port)
|
||||
.setSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
|
||||
.build();
|
||||
// Create an updated region query.
|
||||
var updatedQuery = QueryCurrRegionHttpRsp.newBuilder().setRegionInfo(regionInfo).build();
|
||||
regions.put(
|
||||
region.Name,
|
||||
new RegionData(
|
||||
updatedQuery, Utils.base64Encode(updatedQuery.toByteString().toByteArray())));
|
||||
});
|
||||
|
||||
// Create a config object.
|
||||
byte[] customConfig = "{\"sdkenv\":\"2\",\"checkdevice\":\"false\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}".getBytes();
|
||||
byte[] customConfig =
|
||||
"{\"sdkenv\":\"2\",\"checkdevice\":\"false\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}"
|
||||
.getBytes();
|
||||
Crypto.xor(customConfig, Crypto.DISPATCH_KEY); // XOR the config with the key.
|
||||
|
||||
// Create an updated region list.
|
||||
QueryRegionListHttpRsp updatedRegionList = QueryRegionListHttpRsp.newBuilder()
|
||||
.addAllRegionList(servers)
|
||||
.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
|
||||
.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfig))
|
||||
.setEnableLoginPc(true).build();
|
||||
QueryRegionListHttpRsp updatedRegionList =
|
||||
QueryRegionListHttpRsp.newBuilder()
|
||||
.addAllRegionList(servers)
|
||||
.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
|
||||
.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfig))
|
||||
.setEnableLoginPc(true)
|
||||
.build();
|
||||
|
||||
// Set the region list response.
|
||||
regionListResponse = Utils.base64Encode(updatedRegionList.toByteString().toByteArray());
|
||||
|
||||
// CN
|
||||
// Create a config object.
|
||||
byte[] customConfigcn = "{\"sdkenv\":\"0\",\"checkdevice\":\"true\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}".getBytes();
|
||||
byte[] customConfigcn =
|
||||
"{\"sdkenv\":\"0\",\"checkdevice\":\"true\",\"loadPatch\":\"false\",\"showexception\":\"false\",\"regionConfig\":\"pm|fk|add\",\"downloadMode\":\"0\"}"
|
||||
.getBytes();
|
||||
Crypto.xor(customConfigcn, Crypto.DISPATCH_KEY); // XOR the config with the key.
|
||||
|
||||
// Create an updated region list.
|
||||
QueryRegionListHttpRsp updatedRegionListcn = QueryRegionListHttpRsp.newBuilder()
|
||||
.addAllRegionList(servers)
|
||||
.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
|
||||
.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfigcn))
|
||||
.setEnableLoginPc(true).build();
|
||||
QueryRegionListHttpRsp updatedRegionListcn =
|
||||
QueryRegionListHttpRsp.newBuilder()
|
||||
.addAllRegionList(servers)
|
||||
.setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
|
||||
.setClientCustomConfigEncrypted(ByteString.copyFrom(customConfigcn))
|
||||
.setEnableLoginPc(true)
|
||||
.build();
|
||||
|
||||
// Set the region list response.
|
||||
regionListResponsecn = Utils.base64Encode(updatedRegionListcn.toByteString().toByteArray());
|
||||
@@ -143,7 +160,8 @@ public final class RegionHandler implements Router {
|
||||
String platformName = ctx.queryParam("platform");
|
||||
|
||||
// Determine the region list to use based on the version and platform.
|
||||
if ("CNRELiOS".equals(versionCode) || "CNRELWin".equals(versionCode)
|
||||
if ("CNRELiOS".equals(versionCode)
|
||||
|| "CNRELWin".equals(versionCode)
|
||||
|| "CNRELAndroid".equals(versionCode)) {
|
||||
// Use the CN region list.
|
||||
QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponsecn);
|
||||
@@ -152,7 +170,8 @@ public final class RegionHandler implements Router {
|
||||
|
||||
// Respond with the event result.
|
||||
ctx.result(event.getRegionList());
|
||||
} else if ("OSRELiOS".equals(versionCode) || "OSRELWin".equals(versionCode)
|
||||
} else if ("OSRELiOS".equals(versionCode)
|
||||
|| "OSRELWin".equals(versionCode)
|
||||
|| "OSRELAndroid".equals(versionCode)) {
|
||||
// Use the OS region list.
|
||||
QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse);
|
||||
@@ -187,7 +206,8 @@ public final class RegionHandler implements Router {
|
||||
ctx.result(event.getRegionList());
|
||||
}
|
||||
// Log the request to the console.
|
||||
Grasscutter.getLogger().info(String.format("[Dispatch] Client %s request: query_region_list", ctx.ip()));
|
||||
Grasscutter.getLogger()
|
||||
.info(String.format("[Dispatch] Client %s request: query_region_list", ctx.ip()));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -202,39 +222,53 @@ public final class RegionHandler implements Router {
|
||||
// Get region data.
|
||||
String regionData = "CAESGE5vdCBGb3VuZCB2ZXJzaW9uIGNvbmZpZw==";
|
||||
if (ctx.queryParamMap().values().size() > 0) {
|
||||
if (region != null)
|
||||
regionData = region.getBase64();
|
||||
if (region != null) regionData = region.getBase64();
|
||||
}
|
||||
|
||||
String clientVersion = versionName.replaceAll(Pattern.compile("[a-zA-Z]").pattern(), "");
|
||||
String[] versionCode = clientVersion.split("\\.");
|
||||
int versionMajor = Integer.parseInt(versionCode[0]);
|
||||
int versionMinor = Integer.parseInt(versionCode[1]);
|
||||
int versionFix = Integer.parseInt(versionCode[2]);
|
||||
int versionFix = Integer.parseInt(versionCode[2]);
|
||||
|
||||
if (versionMajor >= 3 || (versionMajor == 2 && versionMinor == 7 && versionFix >= 50) || (versionMajor == 2 && versionMinor == 8)) {
|
||||
if (versionMajor >= 3
|
||||
|| (versionMajor == 2 && versionMinor == 7 && versionFix >= 50)
|
||||
|| (versionMajor == 2 && versionMinor == 8)) {
|
||||
try {
|
||||
QueryCurrentRegionEvent event = new QueryCurrentRegionEvent(regionData); event.call();
|
||||
QueryCurrentRegionEvent event = new QueryCurrentRegionEvent(regionData);
|
||||
event.call();
|
||||
|
||||
String key_id = ctx.queryParam("key_id");
|
||||
|
||||
if (!clientVersion.equals(GameConstants.VERSION)) { // Reject clients when there is a version mismatch
|
||||
if (!clientVersion.equals(
|
||||
GameConstants.VERSION)) { // Reject clients when there is a version mismatch
|
||||
|
||||
boolean updateClient = GameConstants.VERSION.compareTo(clientVersion) > 0;
|
||||
|
||||
QueryCurrRegionHttpRsp rsp = QueryCurrRegionHttpRsp.newBuilder()
|
||||
.setRetcode(Retcode.RET_STOP_SERVER_VALUE)
|
||||
.setMsg("Connection Failed!")
|
||||
.setRegionInfo(RegionInfo.newBuilder())
|
||||
.setStopServer(StopServerInfo.newBuilder()
|
||||
.setUrl("https://discord.gg/grasscutters")
|
||||
.setStopBeginTime((int) Instant.now().getEpochSecond())
|
||||
.setStopEndTime((int) Instant.now().getEpochSecond()*2)
|
||||
.setContentMsg(updateClient ? "\nVersion mismatch outdated client! \n\nServer version: %s\nClient version: %s".formatted(GameConstants.VERSION, clientVersion) : "\nVersion mismatch outdated server! \n\nServer version: %s\nClient version: %s".formatted(GameConstants.VERSION, clientVersion))
|
||||
.build())
|
||||
.buildPartial();
|
||||
QueryCurrRegionHttpRsp rsp =
|
||||
QueryCurrRegionHttpRsp.newBuilder()
|
||||
.setRetcode(Retcode.RET_STOP_SERVER_VALUE)
|
||||
.setMsg("Connection Failed!")
|
||||
.setRegionInfo(RegionInfo.newBuilder())
|
||||
.setStopServer(
|
||||
StopServerInfo.newBuilder()
|
||||
.setUrl("https://discord.gg/grasscutters")
|
||||
.setStopBeginTime((int) Instant.now().getEpochSecond())
|
||||
.setStopEndTime((int) Instant.now().getEpochSecond() * 2)
|
||||
.setContentMsg(
|
||||
updateClient
|
||||
? "\nVersion mismatch outdated client! \n\nServer version: %s\nClient version: %s"
|
||||
.formatted(GameConstants.VERSION, clientVersion)
|
||||
: "\nVersion mismatch outdated server! \n\nServer version: %s\nClient version: %s"
|
||||
.formatted(GameConstants.VERSION, clientVersion))
|
||||
.build())
|
||||
.buildPartial();
|
||||
|
||||
Grasscutter.getLogger().info(String.format("Connection denied for %s due to %s", ctx.ip(), updateClient ? "outdated client!" : "outdated server!"));
|
||||
Grasscutter.getLogger()
|
||||
.info(
|
||||
String.format(
|
||||
"Connection denied for %s due to %s",
|
||||
ctx.ip(), updateClient ? "outdated client!" : "outdated server!"));
|
||||
|
||||
ctx.json(Crypto.encryptAndSignRegionData(rsp.toByteArray(), key_id));
|
||||
return;
|
||||
@@ -251,28 +285,25 @@ public final class RegionHandler implements Router {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
var regionInfo = Utils.base64Decode(event.getRegionInfo());
|
||||
|
||||
ctx.json(Crypto.encryptAndSignRegionData(regionInfo, key_id));
|
||||
}
|
||||
catch (Exception e) {
|
||||
} catch (Exception e) {
|
||||
Grasscutter.getLogger().error("An error occurred while handling query_cur_region.", e);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Invoke event.
|
||||
QueryCurrentRegionEvent event = new QueryCurrentRegionEvent(regionData); event.call();
|
||||
QueryCurrentRegionEvent event = new QueryCurrentRegionEvent(regionData);
|
||||
event.call();
|
||||
// Respond with event result.
|
||||
ctx.result(event.getRegionInfo());
|
||||
}
|
||||
// Log to console.
|
||||
Grasscutter.getLogger().info(String.format("Client %s request: query_cur_region/%s", ctx.ip(), regionName));
|
||||
Grasscutter.getLogger()
|
||||
.info(String.format("Client %s request: query_cur_region/%s", ctx.ip(), regionName));
|
||||
}
|
||||
|
||||
/**
|
||||
* Region data container.
|
||||
*/
|
||||
/** Region data container. */
|
||||
public static class RegionData {
|
||||
private final QueryCurrRegionHttpRsp regionQuery;
|
||||
private final String base64;
|
||||
@@ -293,6 +324,7 @@ public final class RegionHandler implements Router {
|
||||
|
||||
/**
|
||||
* Gets the current region query.
|
||||
*
|
||||
* @return A {@link QueryCurrRegionHttpRsp} object.
|
||||
*/
|
||||
public static QueryCurrRegionHttpRsp getCurrentRegion() {
|
||||
|
||||
@@ -15,6 +15,8 @@ public class HandlerChangeGameTimeReq extends PacketHandler {
|
||||
var req = ChangeGameTimeReq.parseFrom(payload);
|
||||
|
||||
session.getPlayer().getWorld().changeTime(req.getGameTime(), req.getExtraDays());
|
||||
session.getPlayer().sendPacket(new PacketChangeGameTimeRsp(session.getPlayer(), req.getExtraDays()));
|
||||
session
|
||||
.getPlayer()
|
||||
.sendPacket(new PacketChangeGameTimeRsp(session.getPlayer(), req.getExtraDays()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,8 +94,10 @@ public class HandlerCombatInvocationsNotify extends PacketHandler {
|
||||
}
|
||||
}
|
||||
|
||||
// as long as one of these two packets be forwarded to client, the animation of avatar will be interrupted
|
||||
if (motionState == MotionState.MOTION_STATE_NOTIFY || motionState == MotionState.MOTION_STATE_FIGHT) {
|
||||
// as long as one of these two packets be forwarded to client, the animation of avatar
|
||||
// will be interrupted
|
||||
if (motionState == MotionState.MOTION_STATE_NOTIFY
|
||||
|| motionState == MotionState.MOTION_STATE_FIGHT) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,9 @@ public class HandlerDungeonEntryInfoReq extends PacketHandler {
|
||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||
DungeonEntryInfoReq req = DungeonEntryInfoReq.parseFrom(payload);
|
||||
|
||||
session.getServer().getDungeonSystem().sendEntryInfoFor(session.getPlayer(), req.getPointId(), req.getSceneId());
|
||||
session
|
||||
.getServer()
|
||||
.getDungeonSystem()
|
||||
.sendEntryInfoFor(session.getPlayer(), req.getPointId(), req.getSceneId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,12 +15,13 @@ public class HandlerPlayerEnterDungeonReq extends PacketHandler {
|
||||
// Auto template
|
||||
PlayerEnterDungeonReq req = PlayerEnterDungeonReq.parseFrom(payload);
|
||||
|
||||
var success = session
|
||||
.getServer()
|
||||
.getDungeonSystem()
|
||||
.enterDungeon(session.getPlayer(), req.getPointId(), req.getDungeonId());
|
||||
var success =
|
||||
session
|
||||
.getServer()
|
||||
.getDungeonSystem()
|
||||
.enterDungeon(session.getPlayer(), req.getPointId(), req.getDungeonId());
|
||||
session
|
||||
.getPlayer()
|
||||
.sendPacket(new PacketPlayerEnterDungeonRsp(req.getPointId(), req.getDungeonId(), success));
|
||||
.getPlayer()
|
||||
.sendPacket(new PacketPlayerEnterDungeonRsp(req.getPointId(), req.getDungeonId(), success));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package emu.grasscutter.server.packet.recv;
|
||||
|
||||
import emu.grasscutter.game.props.SceneType;
|
||||
import emu.grasscutter.game.quest.enums.QuestContent;
|
||||
import emu.grasscutter.net.packet.Opcodes;
|
||||
import emu.grasscutter.net.packet.PacketHandler;
|
||||
@@ -17,8 +16,9 @@ public class HandlerPostEnterSceneReq extends PacketHandler {
|
||||
var scene = player.getScene();
|
||||
var questManager = player.getQuestManager();
|
||||
|
||||
switch (session.getPlayer().getScene().getSceneType()){
|
||||
case SCENE_ROOM -> questManager.queueEvent(QuestContent.QUEST_CONTENT_ENTER_ROOM, scene.getId(), 0);
|
||||
switch (session.getPlayer().getScene().getSceneType()) {
|
||||
case SCENE_ROOM -> questManager.queueEvent(
|
||||
QuestContent.QUEST_CONTENT_ENTER_ROOM, scene.getId(), 0);
|
||||
case SCENE_WORLD -> {
|
||||
questManager.queueEvent(QuestContent.QUEST_CONTENT_ENTER_MY_WORLD, scene.getId());
|
||||
questManager.queueEvent(QuestContent.QUEST_CONTENT_ENTER_MY_WORLD_SCENE, scene.getId());
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package emu.grasscutter.server.packet.recv;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.game.quest.GameMainQuest;
|
||||
import emu.grasscutter.net.packet.Opcodes;
|
||||
import emu.grasscutter.net.packet.PacketHandler;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
@@ -10,21 +9,18 @@ import emu.grasscutter.server.game.GameSession;
|
||||
import emu.grasscutter.server.packet.send.PacketQuestTransmitRsp;
|
||||
import emu.grasscutter.utils.Position;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.val;
|
||||
|
||||
@Opcodes(PacketOpcodes.QuestTransmitReq)
|
||||
public class HandlerQuestTransmitReq extends PacketHandler {
|
||||
|
||||
@Override
|
||||
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
|
||||
val req = QuestTransmitReq.parseFrom(payload);
|
||||
GameMainQuest mainQuest =
|
||||
session.getPlayer().getQuestManager().getMainQuestById(req.getQuestId() / 100);
|
||||
List<Position> posAndRot = new ArrayList<>();
|
||||
var req = QuestTransmitReq.parseFrom(payload);
|
||||
var mainQuest = session.getPlayer().getQuestManager().getMainQuestById(req.getQuestId() / 100);
|
||||
|
||||
var posAndRot = new ArrayList<Position>();
|
||||
boolean result = false;
|
||||
if (mainQuest.hasTeleportPostion(req.getQuestId(), posAndRot)) {
|
||||
int sceneId =
|
||||
if (mainQuest.hasTeleportPosition(req.getQuestId(), posAndRot)) {
|
||||
var sceneId =
|
||||
GameData.getTeleportDataMap()
|
||||
.get(req.getQuestId())
|
||||
.getTransmit_points()
|
||||
@@ -36,6 +32,7 @@ public class HandlerQuestTransmitReq extends PacketHandler {
|
||||
.getWorld()
|
||||
.transferPlayerToScene(session.getPlayer(), sceneId, posAndRot.get(0));
|
||||
}
|
||||
|
||||
session.send(new PacketQuestTransmitRsp(result, req));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
|
||||
package emu.grasscutter.server.packet.recv;
|
||||
|
||||
import javax.lang.model.type.TypeMirror;
|
||||
|
||||
import emu.grasscutter.net.packet.Opcodes;
|
||||
import emu.grasscutter.net.packet.PacketHandler;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
@@ -24,8 +21,9 @@ public class HandlerSceneAudioNotify extends PacketHandler {
|
||||
int type = notify.getType();
|
||||
List<Integer> param1 = notify.getParam1List();
|
||||
|
||||
session.getPlayer().getScene().broadcastPacket(new PacketSceneAudioNotify(sourceUid, param2, param3, type, param1));
|
||||
session
|
||||
.getPlayer()
|
||||
.getScene()
|
||||
.broadcastPacket(new PacketSceneAudioNotify(sourceUid, param2, param3, type, param1));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ public class HandlerSetPlayerBornDataReq extends PacketHandler {
|
||||
// Check if the default Anemo skill should be given.
|
||||
if (!GAME_OPTIONS.questing) {
|
||||
mainCharacter.setSkillDepotData(
|
||||
GameData.getAvatarSkillDepotDataMap().get(startingSkillDepot));
|
||||
GameData.getAvatarSkillDepotDataMap().get(startingSkillDepot));
|
||||
}
|
||||
|
||||
// Manually handle adding to team
|
||||
|
||||
@@ -17,9 +17,7 @@ public class HandlerUnlockPersonalLineReq extends PacketHandler {
|
||||
var req = UnlockPersonalLineReq.parseFrom(payload);
|
||||
var data = GameData.getPersonalLineDataMap().get(req.getPersonalLineId());
|
||||
if (data == null) {
|
||||
session.send(
|
||||
new PacketUnlockPersonalLineRsp(
|
||||
req.getPersonalLineId(), Retcode.RET_FAIL));
|
||||
session.send(new PacketUnlockPersonalLineRsp(req.getPersonalLineId(), Retcode.RET_FAIL));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ import emu.grasscutter.game.props.FightProperty;
|
||||
import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class PacketAvatarFightPropUpdateNotify extends BasePacket {
|
||||
|
||||
@@ -14,11 +14,14 @@ public class PacketAvatarTeamUpdateNotify extends BasePacket {
|
||||
|
||||
var teamManager = player.getTeamManager();
|
||||
if (teamManager.isUsingTrialTeam()) {
|
||||
proto.addAllTempAvatarGuidList(teamManager.getActiveTeam().stream()
|
||||
.map(entity -> entity.getAvatar().getGuid()).toList());
|
||||
proto.addAllTempAvatarGuidList(
|
||||
teamManager.getActiveTeam().stream()
|
||||
.map(entity -> entity.getAvatar().getGuid())
|
||||
.toList());
|
||||
} else {
|
||||
teamManager.getTeams().forEach((key, value) ->
|
||||
proto.putAvatarTeamMap(key, value.toProto(player)));
|
||||
teamManager
|
||||
.getTeams()
|
||||
.forEach((key, value) -> proto.putAvatarTeamMap(key, value.toProto(player)));
|
||||
}
|
||||
|
||||
this.setData(proto);
|
||||
|
||||
@@ -10,9 +10,10 @@ public class PacketBuyResinRsp extends BasePacket {
|
||||
public PacketBuyResinRsp(Player player, int ret) {
|
||||
super(PacketOpcodes.BuyResinRsp);
|
||||
|
||||
this.setData(BuyResinRspOuterClass.BuyResinRsp.newBuilder()
|
||||
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
|
||||
.setRetcode(ret)
|
||||
.build());
|
||||
this.setData(
|
||||
BuyResinRspOuterClass.BuyResinRsp.newBuilder()
|
||||
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
|
||||
.setRetcode(ret)
|
||||
.build());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,9 +12,9 @@ public class PacketChangeGameTimeRsp extends BasePacket {
|
||||
|
||||
ChangeGameTimeRsp proto =
|
||||
ChangeGameTimeRsp.newBuilder()
|
||||
.setCurGameTime(player.getWorld().getGameTime())
|
||||
.setExtraDays(extraDays)
|
||||
.build();
|
||||
.setCurGameTime(player.getWorld().getGameTime())
|
||||
.setExtraDays(extraDays)
|
||||
.build();
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
|
||||
@@ -10,9 +10,7 @@ public class PacketDropHintNotify extends BasePacket {
|
||||
public PacketDropHintNotify(int itemId, Vector position) {
|
||||
super(PacketOpcodes.DropHintNotify);
|
||||
|
||||
var proto = DropHintNotify.newBuilder()
|
||||
.addItemIdList(itemId)
|
||||
.setPosition(position);
|
||||
var proto = DropHintNotify.newBuilder().addItemIdList(itemId).setPosition(position);
|
||||
this.setData(proto.build());
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ import emu.grasscutter.net.packet.BasePacket;
|
||||
import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo;
|
||||
import emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@@ -36,19 +35,18 @@ public class PacketDungeonEntryInfoRsp extends BasePacket {
|
||||
public PacketDungeonEntryInfoRsp(PointData pointData, List<Integer> additional) {
|
||||
super(PacketOpcodes.DungeonEntryInfoRsp);
|
||||
|
||||
var packet = DungeonEntryInfoRsp.newBuilder()
|
||||
.setPointId(pointData.getId());
|
||||
var packet = DungeonEntryInfoRsp.newBuilder().setPointId(pointData.getId());
|
||||
|
||||
// Add dungeon IDs from the point data.
|
||||
if (pointData.getDungeonIds() != null) {
|
||||
Arrays.stream(pointData.getDungeonIds())
|
||||
.forEach(id -> packet.addDungeonEntryList(
|
||||
DungeonEntryInfo.newBuilder().setDungeonId(id)));
|
||||
.forEach(
|
||||
id -> packet.addDungeonEntryList(DungeonEntryInfo.newBuilder().setDungeonId(id)));
|
||||
}
|
||||
|
||||
// Add additional dungeon IDs.
|
||||
additional.forEach(id -> packet.addDungeonEntryList(
|
||||
DungeonEntryInfo.newBuilder().setDungeonId(id)));
|
||||
additional.forEach(
|
||||
id -> packet.addDungeonEntryList(DungeonEntryInfo.newBuilder().setDungeonId(id)));
|
||||
|
||||
this.setData(packet);
|
||||
}
|
||||
|
||||
@@ -8,14 +8,15 @@ import emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify;
|
||||
|
||||
public class PacketResinChangeNotify extends BasePacket {
|
||||
|
||||
public PacketResinChangeNotify(Player player) {
|
||||
public PacketResinChangeNotify(Player player) {
|
||||
super(PacketOpcodes.ResinChangeNotify);
|
||||
|
||||
ResinChangeNotify proto = ResinChangeNotify.newBuilder()
|
||||
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
|
||||
.setNextAddTimestamp(player.getNextResinRefresh())
|
||||
.setCurBuyCount(player.getResinBuyCount())
|
||||
.build();
|
||||
ResinChangeNotify proto =
|
||||
ResinChangeNotify.newBuilder()
|
||||
.setCurValue(player.getProperty(PlayerProperty.PROP_PLAYER_RESIN))
|
||||
.setNextAddTimestamp(player.getNextResinRefresh())
|
||||
.setCurBuyCount(player.getResinBuyCount())
|
||||
.build();
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
|
||||
@@ -7,17 +7,19 @@ import java.util.List;
|
||||
|
||||
public class PacketSceneAudioNotify extends BasePacket {
|
||||
|
||||
public PacketSceneAudioNotify(int sourceUid, List<Float> param2, List<String> param3, int type, List<Integer> param1) {
|
||||
public PacketSceneAudioNotify(
|
||||
int sourceUid, List<Float> param2, List<String> param3, int type, List<Integer> param1) {
|
||||
super(PacketOpcodes.SceneAudioNotify);
|
||||
|
||||
SceneAudioNotifyOuterClass.SceneAudioNotify proto = SceneAudioNotifyOuterClass.SceneAudioNotify.newBuilder()
|
||||
.setSourceUid(sourceUid)
|
||||
.addAllParam2(param2)
|
||||
.addAllParam3(param3)
|
||||
.setType(type)
|
||||
.addAllParam1(param1)
|
||||
.build();
|
||||
|
||||
SceneAudioNotifyOuterClass.SceneAudioNotify proto =
|
||||
SceneAudioNotifyOuterClass.SceneAudioNotify.newBuilder()
|
||||
.setSourceUid(sourceUid)
|
||||
.addAllParam2(param2)
|
||||
.addAllParam3(param3)
|
||||
.setType(type)
|
||||
.addAllParam1(param1)
|
||||
.build();
|
||||
|
||||
this.setData(proto);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,8 +10,10 @@ public final class PacketServerGlobalValueChangeNotify extends BasePacket {
|
||||
public PacketServerGlobalValueChangeNotify(GameEntity entity, String abilityHash, int value) {
|
||||
super(PacketOpcodes.ServerGlobalValueChangeNotify);
|
||||
|
||||
this.setData(ServerGlobalValueChangeNotify.newBuilder()
|
||||
.setEntityId(entity.getId()).setValue(value)
|
||||
.setKeyHash(Utils.abilityHash(abilityHash)));
|
||||
this.setData(
|
||||
ServerGlobalValueChangeNotify.newBuilder()
|
||||
.setEntityId(entity.getId())
|
||||
.setValue(value)
|
||||
.setKeyHash(Utils.abilityHash(abilityHash)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,13 +5,14 @@ import emu.grasscutter.net.packet.PacketOpcodes;
|
||||
import emu.grasscutter.net.proto.WorldChestOpenNotifyOuterClass.WorldChestOpenNotify;
|
||||
|
||||
public class PacketWorldChestOpenNotify extends BasePacket {
|
||||
public PacketWorldChestOpenNotify(int groupId,int sceneId,int configId){
|
||||
public PacketWorldChestOpenNotify(int groupId, int sceneId, int configId) {
|
||||
super(PacketOpcodes.WorldChestOpenNotify);
|
||||
|
||||
this.setData(WorldChestOpenNotify.newBuilder()
|
||||
.setGroupId(groupId)
|
||||
.setSceneId(sceneId)
|
||||
.setConfigId(configId)
|
||||
.build());
|
||||
this.setData(
|
||||
WorldChestOpenNotify.newBuilder()
|
||||
.setGroupId(groupId)
|
||||
.setSceneId(sceneId)
|
||||
.setConfigId(configId)
|
||||
.build());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user