Commit 6e5d9866 authored by github-actions's avatar github-actions
Browse files

Fix whitespace [skip actions]

parent 005a0bce
...@@ -225,7 +225,7 @@ public final class CommandMap { ...@@ -225,7 +225,7 @@ public final class CommandMap {
Grasscutter.getLogger().info("Command used by server console: " + rawMessage); Grasscutter.getLogger().info("Command used by server console: " + rawMessage);
} }
} }
rawMessage = rawMessage.trim(); rawMessage = rawMessage.trim();
if (rawMessage.length() == 0) { if (rawMessage.length() == 0) {
CommandHandler.sendTranslatedMessage(player, "commands.generic.not_specified"); CommandHandler.sendTranslatedMessage(player, "commands.generic.not_specified");
......
...@@ -96,7 +96,7 @@ public class ConfigContainer { ...@@ -96,7 +96,7 @@ public class ConfigContainer {
public Set<Integer> debugBlacklist = Set.of(); public Set<Integer> debugBlacklist = Set.of();
public ServerRunMode runMode = ServerRunMode.HYBRID; public ServerRunMode runMode = ServerRunMode.HYBRID;
public boolean logCommands = false; public boolean logCommands = false;
public HTTP http = new HTTP(); public HTTP http = new HTTP();
public Game game = new Game(); public Game game = new Game();
......
...@@ -10,71 +10,71 @@ import it.unimi.dsi.fastutil.ints.IntArrayList; ...@@ -10,71 +10,71 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntList;
public class PointData { public class PointData {
private int id; private int id;
private String $type; private String $type;
private Position tranPos; private Position tranPos;
@SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"}) @SerializedName(value="dungeonIds", alternate={"JHHFPGJNMIN"})
private int[] dungeonIds; private int[] dungeonIds;
@SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"}) @SerializedName(value="dungeonRandomList", alternate={"OIBKFJNBLHO"})
private int[] dungeonRandomList; private int[] dungeonRandomList;
@SerializedName(value="tranSceneId", alternate={"JHBICGBAPIH"}) @SerializedName(value="tranSceneId", alternate={"JHBICGBAPIH"})
private int tranSceneId; private int tranSceneId;
public int getId() { public int getId() {
return id; return id;
} }
public void setId(int id) { public void setId(int id) {
this.id = id; this.id = id;
} }
public String getType() { public String getType() {
return $type; return $type;
} }
public Position getTranPos() { public Position getTranPos() {
return tranPos; return tranPos;
} }
public int[] getDungeonIds() { public int[] getDungeonIds() {
return dungeonIds; return dungeonIds;
} }
public int[] getDungeonRandomList() { public int[] getDungeonRandomList() {
return dungeonRandomList; return dungeonRandomList;
} }
public int getTranSceneId() { public int getTranSceneId() {
return tranSceneId; return tranSceneId;
} }
public void setTranSceneId(int tranSceneId) { public void setTranSceneId(int tranSceneId) {
this.tranSceneId = tranSceneId; this.tranSceneId = tranSceneId;
} }
public void updateDailyDungeon() { public void updateDailyDungeon() {
if (getDungeonRandomList() == null || getDungeonRandomList().length == 0) { if (getDungeonRandomList() == null || getDungeonRandomList().length == 0) {
return; return;
} }
IntList newDungeons = new IntArrayList(); IntList newDungeons = new IntArrayList();
int day = Grasscutter.getCurrentDayOfWeek(); int day = Grasscutter.getCurrentDayOfWeek();
for (int randomId : getDungeonRandomList()) { for (int randomId : getDungeonRandomList()) {
DailyDungeonData data = GameData.getDailyDungeonDataMap().get(randomId); DailyDungeonData data = GameData.getDailyDungeonDataMap().get(randomId);
if (data != null) { if (data != null) {
int[] addDungeons = data.getDungeonsByDay(day); int[] addDungeons = data.getDungeonsByDay(day);
for (int d : addDungeons) { for (int d : addDungeons) {
newDungeons.add(d); newDungeons.add(d);
} }
} }
} }
this.dungeonIds = newDungeons.toIntArray(); this.dungeonIds = newDungeons.toIntArray();
} }
} }
...@@ -6,30 +6,30 @@ import emu.grasscutter.data.ResourceType; ...@@ -6,30 +6,30 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = "AvatarCostumeExcelConfigData.json") @ResourceType(name = "AvatarCostumeExcelConfigData.json")
public class AvatarCostumeData extends GameResource { public class AvatarCostumeData extends GameResource {
private int costumeId; private int costumeId;
private int itemId; private int itemId;
private int characterId; private int characterId;
private int quality; private int quality;
@Override
public int getId() {
return this.costumeId;
}
public int getItemId() {
return this.itemId;
}
public int getCharacterId() { @Override
return characterId; public int getId() {
} return this.costumeId;
}
public int getQuality() {
public int getItemId() {
return this.itemId;
}
public int getCharacterId() {
return characterId;
}
public int getQuality() {
return quality; return quality;
} }
@Override @Override
public void onLoad() { public void onLoad() {
GameData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this); GameData.getAvatarCostumeDataItemIdMap().put(this.getItemId(), this);
} }
} }
...@@ -8,52 +8,52 @@ import emu.grasscutter.data.common.FightPropData; ...@@ -8,52 +8,52 @@ import emu.grasscutter.data.common.FightPropData;
@ResourceType(name = "EquipAffixExcelConfigData.json") @ResourceType(name = "EquipAffixExcelConfigData.json")
public class EquipAffixData extends GameResource { public class EquipAffixData extends GameResource {
private int affixId; private int affixId;
private int id; private int id;
private int level; private int level;
private long nameTextMapHash; private long nameTextMapHash;
private String openConfig; private String openConfig;
private FightPropData[] addProps; private FightPropData[] addProps;
private float[] paramList; private float[] paramList;
@Override @Override
public int getId() { public int getId() {
return affixId; return affixId;
} }
public int getMainId() { public int getMainId() {
return id; return id;
} }
public int getLevel() { public int getLevel() {
return level; return level;
} }
public long getNameTextMapHash() { public long getNameTextMapHash() {
return nameTextMapHash; return nameTextMapHash;
} }
public String getOpenConfig() { public String getOpenConfig() {
return openConfig; return openConfig;
} }
public FightPropData[] getAddProps() { public FightPropData[] getAddProps() {
return addProps; return addProps;
} }
public float[] getParamList() { public float[] getParamList() {
return paramList; return paramList;
} }
@Override @Override
public void onLoad() { public void onLoad() {
ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length); ArrayList<FightPropData> parsed = new ArrayList<FightPropData>(getAddProps().length);
for (FightPropData prop : getAddProps()) { for (FightPropData prop : getAddProps()) {
if (prop.getPropType() != null && prop.getValue() != 0f) { if (prop.getPropType() != null && prop.getValue() != 0f) {
prop.onLoad(); prop.onLoad();
parsed.add(prop); parsed.add(prop);
} }
} }
this.addProps = parsed.toArray(new FightPropData[parsed.size()]); this.addProps = parsed.toArray(new FightPropData[parsed.size()]);
} }
} }
...@@ -120,7 +120,7 @@ public class ItemData extends GameResource { ...@@ -120,7 +120,7 @@ public class ItemData extends GameResource {
if (this.getFurnitureGadgetID() != null) { if (this.getFurnitureGadgetID() != null) {
this.furnitureGadgetID = this.furnitureGadgetID.stream().filter(x -> x > 0).toList(); this.furnitureGadgetID = this.furnitureGadgetID.stream().filter(x -> x > 0).toList();
} }
// Prevent material type from being null // Prevent material type from being null
this.materialType = this.materialType == null ? MaterialType.MATERIAL_NONE : this.materialType; this.materialType = this.materialType == null ? MaterialType.MATERIAL_NONE : this.materialType;
} }
......
...@@ -7,27 +7,27 @@ import emu.grasscutter.data.ResourceType; ...@@ -7,27 +7,27 @@ import emu.grasscutter.data.ResourceType;
@ResourceType(name = "ReliquarySetExcelConfigData.json") @ResourceType(name = "ReliquarySetExcelConfigData.json")
public class ReliquarySetData extends GameResource { public class ReliquarySetData extends GameResource {
private int setId; private int setId;
private int[] setNeedNum; private int[] setNeedNum;
@SerializedName(value="equipAffixId", alternate={"EquipAffixId"}) @SerializedName(value="equipAffixId", alternate={"EquipAffixId"})
private int equipAffixId; private int equipAffixId;
@Override @Override
public int getId() { public int getId() {
return setId; return setId;
} }
public int[] getSetNeedNum() { public int[] getSetNeedNum() {
return setNeedNum; return setNeedNum;
} }
public int getEquipAffixId() { public int getEquipAffixId() {
return equipAffixId; return equipAffixId;
} }
@Override @Override
public void onLoad() { public void onLoad() {
} }
} }
...@@ -600,7 +600,7 @@ public class Avatar { ...@@ -600,7 +600,7 @@ public class Avatar {
} }
} }
} }
public void addToExtraAbilityEmbryos(String openConfig) { public void addToExtraAbilityEmbryos(String openConfig) {
this.addToExtraAbilityEmbryos(openConfig, false); this.addToExtraAbilityEmbryos(openConfig, false);
} }
......
...@@ -130,7 +130,7 @@ public class EntityAvatar extends GameEntity { ...@@ -130,7 +130,7 @@ public class EntityAvatar extends GameEntity {
if (!this.isAlive()) { if (!this.isAlive()) {
return 0f; return 0f;
} }
float healed = super.heal(amount); float healed = super.heal(amount);
if (healed > 0f) { if (healed > 0f) {
......
...@@ -16,66 +16,66 @@ import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp; ...@@ -16,66 +16,66 @@ import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
public class GadgetGatherObject extends GadgetContent { public class GadgetGatherObject extends GadgetContent {
private int itemId; private int itemId;
private boolean isForbidGuest; private boolean isForbidGuest;
public GadgetGatherObject(EntityGadget gadget) { public GadgetGatherObject(EntityGadget gadget) {
super(gadget); super(gadget);
if (gadget.getSpawnEntry() != null) { if (gadget.getSpawnEntry() != null) {
this.itemId = gadget.getSpawnEntry().getGatherItemId(); this.itemId = gadget.getSpawnEntry().getGatherItemId();
} }
} }
public int getItemId() { public int getItemId() {
return this.itemId; return this.itemId;
} }
public boolean isForbidGuest() { public boolean isForbidGuest() {
return isForbidGuest; return isForbidGuest;
} }
public boolean onInteract(Player player, GadgetInteractReq req) { public boolean onInteract(Player player, GadgetInteractReq req) {
// Sanity check // Sanity check
ItemData itemData = GameData.getItemDataMap().get(getItemId()); ItemData itemData = GameData.getItemDataMap().get(getItemId());
if (itemData == null) { if (itemData == null) {
return false; return false;
} }
GameItem item = new GameItem(itemData, 1); GameItem item = new GameItem(itemData, 1);
player.getInventory().addItem(item, ActionReason.Gather); player.getInventory().addItem(item, ActionReason.Gather);
getGadget().getScene().broadcastPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_GATHER)); getGadget().getScene().broadcastPacket(new PacketGadgetInteractRsp(getGadget(), InteractType.INTERACT_TYPE_GATHER));
return true; return true;
} }
public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) { public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder() GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder()
.setItemId(this.getItemId()) .setItemId(this.getItemId())
.setIsForbidGuest(this.isForbidGuest()) .setIsForbidGuest(this.isForbidGuest())
.build(); .build();
gadgetInfo.setGatherGadget(gatherGadgetInfo); gadgetInfo.setGatherGadget(gatherGadgetInfo);
} }
public void dropItems(Player player) { public void dropItems(Player player) {
Scene scene = getGadget().getScene(); Scene scene = getGadget().getScene();
int times = Utils.randomRange(1,2); int times = Utils.randomRange(1,2);
for (int i = 0 ; i < times ; i++) { for (int i = 0 ; i < times ; i++) {
EntityItem item = new EntityItem( EntityItem item = new EntityItem(
scene, scene,
player, player,
GameData.getItemDataMap().get(itemId), GameData.getItemDataMap().get(itemId),
getGadget().getPosition().nearby2d(1f).addY(2f), getGadget().getPosition().nearby2d(1f).addY(2f),
1, 1,
true); true);
scene.addEntity(item); scene.addEntity(item);
} }
scene.killEntity(this.getGadget(), player.getTeamManager().getCurrentAvatarEntity().getId()); scene.killEntity(this.getGadget(), player.getTeamManager().getCurrentAvatarEntity().getId());
// Todo: add record // Todo: add record
} }
} }
...@@ -14,50 +14,50 @@ import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo; ...@@ -14,50 +14,50 @@ import emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo;
import emu.grasscutter.utils.Utils; import emu.grasscutter.utils.Utils;
public class GadgetGatherPoint extends GadgetContent { public class GadgetGatherPoint extends GadgetContent {
private int itemId; private int itemId;
private boolean isForbidGuest; private boolean isForbidGuest;
public GadgetGatherPoint(EntityGadget gadget) {
super(gadget);
if (gadget.getSpawnEntry() != null) {
this.itemId = gadget.getSpawnEntry().getGatherItemId();
} else {
GatherData gatherData = GameData.getGatherDataMap().get(gadget.getPointType());
this.itemId = gatherData.getItemId();
this.isForbidGuest = gatherData.isForbidGuest();
}
}
public int getItemId() {
return this.itemId;
}
public boolean isForbidGuest() { public GadgetGatherPoint(EntityGadget gadget) {
return isForbidGuest; super(gadget);
}
public boolean onInteract(Player player, GadgetInteractReq req) { if (gadget.getSpawnEntry() != null) {
GameItem item = new GameItem(getItemId(), 1); this.itemId = gadget.getSpawnEntry().getGatherItemId();
} else {
player.getInventory().addItem(item, ActionReason.Gather); GatherData gatherData = GameData.getGatherDataMap().get(gadget.getPointType());
this.itemId = gatherData.getItemId();
return true; this.isForbidGuest = gatherData.isForbidGuest();
} }
}
public int getItemId() {
return this.itemId;
}
public boolean isForbidGuest() {
return isForbidGuest;
}
public boolean onInteract(Player player, GadgetInteractReq req) {
GameItem item = new GameItem(getItemId(), 1);
player.getInventory().addItem(item, ActionReason.Gather);
public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) { return true;
GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder() }
.setItemId(this.getItemId())
.setIsForbidGuest(this.isForbidGuest())
.build();
gadgetInfo.setGatherGadget(gatherGadgetInfo); public void onBuildProto(SceneGadgetInfo.Builder gadgetInfo) {
} GatherGadgetInfo gatherGadgetInfo = GatherGadgetInfo.newBuilder()
.setItemId(this.getItemId())
.setIsForbidGuest(this.isForbidGuest())
.build();
gadgetInfo.setGatherGadget(gatherGadgetInfo);
}
public void dropItems(Player player) {
Scene scene = getGadget().getScene();
int times = Utils.randomRange(1,2);
public void dropItems(Player player) {
Scene scene = getGadget().getScene();
int times = Utils.randomRange(1,2);
for (int i = 0 ; i < times ; i++) { for (int i = 0 ; i < times ; i++) {
EntityItem item = new EntityItem( EntityItem item = new EntityItem(
scene, scene,
...@@ -69,11 +69,11 @@ public class GadgetGatherPoint extends GadgetContent { ...@@ -69,11 +69,11 @@ public class GadgetGatherPoint extends GadgetContent {
.addZ(Utils.randomFloatRange(-1f, 1f)), .addZ(Utils.randomFloatRange(-1f, 1f)),
1, 1,
true); true);
scene.addEntity(item); scene.addEntity(item);
} }
scene.killEntity(this.getGadget(), player.getTeamManager().getCurrentAvatarEntity().getId()); scene.killEntity(this.getGadget(), player.getTeamManager().getCurrentAvatarEntity().getId());
// Todo: add record // Todo: add record
} }
} }
...@@ -45,7 +45,7 @@ public class HomeBlockItem { ...@@ -45,7 +45,7 @@ public class HomeBlockItem {
.toList(); .toList();
} }
public int calComfort(){ public int calComfort() {
return this.deployFurnitureList.stream() return this.deployFurnitureList.stream()
.mapToInt(HomeFurnitureItem::getComfort) .mapToInt(HomeFurnitureItem::getComfort)
.sum(); .sum();
......
...@@ -15,11 +15,11 @@ public class MapMark { ...@@ -15,11 +15,11 @@ public class MapMark {
private int monsterId; private int monsterId;
private MapMarkFromType mapMarkFromType; private MapMarkFromType mapMarkFromType;
private int questId; private int questId;
@Deprecated // Morhpia @Deprecated // Morhpia
public MapMark() { public MapMark() {
this.mapMarkPointType = MapMarkPointType.MAP_MARK_POINT_TYPE_MONSTER; this.mapMarkPointType = MapMarkPointType.MAP_MARK_POINT_TYPE_MONSTER;
this.mapMarkFromType = MapMarkFromType.MAP_MARK_FROM_TYPE_MONSTER; this.mapMarkFromType = MapMarkFromType.MAP_MARK_FROM_TYPE_MONSTER;
} }
public MapMark(MapMarkPoint mapMarkPoint) { public MapMark(MapMarkPoint mapMarkPoint) {
...@@ -35,28 +35,28 @@ public class MapMark { ...@@ -35,28 +35,28 @@ public class MapMark {
public int getSceneId() { public int getSceneId() {
return this.sceneId; return this.sceneId;
} }
public String getName() { public String getName() {
return this.name; return this.name;
} }
public Position getPosition() { public Position getPosition() {
return this.position; return this.position;
} }
public MapMarkPointType getMapMarkPointType() { public MapMarkPointType getMapMarkPointType() {
return this.mapMarkPointType; return this.mapMarkPointType;
} }
public int getMonsterId() { public int getMonsterId() {
return this.monsterId; return this.monsterId;
} }
public MapMarkFromType getMapMarkFromType() { public MapMarkFromType getMapMarkFromType() {
return this.mapMarkFromType; return this.mapMarkFromType;
} }
public int getQuestId() { public int getQuestId() {
return this.questId; return this.questId;
} }
} }
\ No newline at end of file
...@@ -181,7 +181,7 @@ public class GameQuest { ...@@ -181,7 +181,7 @@ public class GameQuest {
} }
return false; return false;
} }
public void save() { public void save() {
getMainQuest().save(); getMainQuest().save();
} }
......
...@@ -313,20 +313,20 @@ public class QuestManager extends BasePlayerManager { ...@@ -313,20 +313,20 @@ public class QuestManager extends BasePlayerManager {
} }
public void loadFromDatabase() { public void loadFromDatabase() {
List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer()); List<GameMainQuest> quests = DatabaseHelper.getAllQuests(getPlayer());
for (GameMainQuest mainQuest : quests) { for (GameMainQuest mainQuest : quests) {
boolean cancelAdd = false; boolean cancelAdd = false;
mainQuest.setOwner(this.getPlayer()); mainQuest.setOwner(this.getPlayer());
for (GameQuest quest : mainQuest.getChildQuests().values()) { for (GameQuest quest : mainQuest.getChildQuests().values()) {
QuestData questConfig = GameData.getQuestDataMap().get(quest.getSubQuestId()); QuestData questConfig = GameData.getQuestDataMap().get(quest.getSubQuestId());
if (questConfig == null) { if (questConfig == null) {
mainQuest.delete(); mainQuest.delete();
cancelAdd = true; cancelAdd = true;
break; break;
} }
quest.setMainQuest(mainQuest); quest.setMainQuest(mainQuest);
quest.setConfig(questConfig); quest.setConfig(questConfig);
} }
......
...@@ -13,7 +13,7 @@ public interface Router { ...@@ -13,7 +13,7 @@ public interface Router {
* @param javalin A Javalin instance. * @param javalin A Javalin instance.
*/ */
void applyRoutes(Javalin javalin); void applyRoutes(Javalin javalin);
/** /**
* Applies this handler to all endpoint types * Applies this handler to all endpoint types
* @param javalin A Javalin instance. * @param javalin A Javalin instance.
......
...@@ -15,12 +15,12 @@ import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp; ...@@ -15,12 +15,12 @@ import emu.grasscutter.server.packet.send.PacketMusicGameSettleRsp;
@Opcodes(PacketOpcodes.MusicGameSettleReq) @Opcodes(PacketOpcodes.MusicGameSettleReq)
public class HandlerMusicGameSettleReq extends PacketHandler { public class HandlerMusicGameSettleReq extends PacketHandler {
@Override @Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
var req = MusicGameSettleReqOuterClass.MusicGameSettleReq.parseFrom(payload); var req = MusicGameSettleReqOuterClass.MusicGameSettleReq.parseFrom(payload);
var playerData = session.getPlayer().getActivityManager().getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME); var playerData = session.getPlayer().getActivityManager().getPlayerActivityDataByActivityType(ActivityType.NEW_ACTIVITY_MUSIC_GAME);
if(playerData.isEmpty()){ if (playerData.isEmpty()) {
return; return;
} }
var handler = (MusicGameActivityHandler) playerData.get().getActivityHandler(); var handler = (MusicGameActivityHandler) playerData.get().getActivityHandler();
...@@ -32,7 +32,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler { ...@@ -32,7 +32,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
// Probably was an issue in 2.8 but was discovered in 3.0 port. // Probably was an issue in 2.8 but was discovered in 3.0 port.
// - Benj // - Benj
/*if(req.getMusicShareId() == 0){ /*if (req.getMusicShareId() == 0) {
session.getPlayer().getActivityManager().triggerWatcher( session.getPlayer().getActivityManager().triggerWatcher(
WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE, WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
String.valueOf(req.getMusicBasicId()), String.valueOf(req.getMusicBasicId()),
...@@ -48,7 +48,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler { ...@@ -48,7 +48,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
// update activity info // update activity info
session.send(new PacketActivityInfoNotify(handler.toProto(playerData.get()))); session.send(new PacketActivityInfoNotify(handler.toProto(playerData.get())));
}else{ }else {
handler.setMusicGameCustomBeatmapRecord(playerData.get(), handler.setMusicGameCustomBeatmapRecord(playerData.get(),
MusicGamePlayerData.CustomBeatmapRecord.of() MusicGamePlayerData.CustomBeatmapRecord.of()
.musicShareId(req.getMusicShareId()) .musicShareId(req.getMusicShareId())
...@@ -58,7 +58,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler { ...@@ -58,7 +58,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
} }
session.send(new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getMusicShareId(), isNewRecord));*/ session.send(new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getMusicShareId(), isNewRecord));*/
} }
} }
...@@ -13,24 +13,24 @@ import emu.grasscutter.utils.Position; ...@@ -13,24 +13,24 @@ import emu.grasscutter.utils.Position;
@Opcodes(PacketOpcodes.PersonalSceneJumpReq) @Opcodes(PacketOpcodes.PersonalSceneJumpReq)
public class HandlerPersonalSceneJumpReq extends PacketHandler { public class HandlerPersonalSceneJumpReq extends PacketHandler {
@Override
public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
PersonalSceneJumpReq req = PersonalSceneJumpReq.parseFrom(payload);
var player = session.getPlayer();
// get the scene point @Override
String code = player.getSceneId() + "_" + req.getPointId(); public void handle(GameSession session, byte[] header, byte[] payload) throws Exception {
ScenePointEntry scenePointEntry = GameData.getScenePointEntries().get(code); PersonalSceneJumpReq req = PersonalSceneJumpReq.parseFrom(payload);
var player = session.getPlayer();
if (scenePointEntry != null) { // get the scene point
Position pos = scenePointEntry.getPointData().getTranPos().clone(); // This might not need cloning String code = player.getSceneId() + "_" + req.getPointId();
int sceneId = scenePointEntry.getPointData().getTranSceneId(); ScenePointEntry scenePointEntry = GameData.getScenePointEntries().get(code);
player.getWorld().transferPlayerToScene(player, sceneId, pos); if (scenePointEntry != null) {
session.send(new PacketPersonalSceneJumpRsp(sceneId, pos)); Position pos = scenePointEntry.getPointData().getTranPos().clone(); // This might not need cloning
} int sceneId = scenePointEntry.getPointData().getTranSceneId();
} player.getWorld().transferPlayerToScene(player, sceneId, pos);
session.send(new PacketPersonalSceneJumpRsp(sceneId, pos));
}
}
} }
...@@ -12,7 +12,7 @@ public class PacketAddCustomTeamRsp extends BasePacket { ...@@ -12,7 +12,7 @@ public class PacketAddCustomTeamRsp extends BasePacket {
AddCustomTeamRsp proto = AddCustomTeamRsp.newBuilder() AddCustomTeamRsp proto = AddCustomTeamRsp.newBuilder()
.setRetcode(retcode.getNumber()) .setRetcode(retcode.getNumber())
.build(); .build();
this.setData(proto); this.setData(proto);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment