Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-13 13:54:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warn the server owner if RogueMapGen isnt found in the data folder

Browse Source
This commit is contained in:
Melledy
2024-05-21 00:46:45 -07:00
parent fa93084893
commit 64f013d87d
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/lunarcore/data/ResourceLoader.java
View File

@@ -366,7 +366,10 @@ public class ResourceLoader {
private static void loadRogueMapGen() { private static void loadRogueMapGen() {
File file = new File(LunarCore.getConfig().getDataDir() + "/RogueMapGen.json"); File file = new File(LunarCore.getConfig().getDataDir() + "/RogueMapGen.json");
if (!file.exists()) return; if (!file.exists()) {
LunarCore.getLogger().warn("RogueMapGen not found in data folder. Simulated universe will not work.");
return;
}
try (FileReader reader = new FileReader(file)) { try (FileReader reader = new FileReader(file)) {
Map<Integer, int[]> rogue = gson.fromJson(reader, TypeToken.getParameterized(Map.class, Integer.class, int[].class).getType()); Map<Integer, int[]> rogue = gson.fromJson(reader, TypeToken.getParameterized(Map.class, Integer.class, int[].class).getType());

7
src/main/java/emu/lunarcore/game/rogue/RogueManager.java
View File

@@ -23,6 +23,7 @@ import emu.lunarcore.proto.RogueTalentInfoOuterClass.RogueTalentInfo;
import emu.lunarcore.proto.RogueTalentOuterClass.RogueTalent; import emu.lunarcore.proto.RogueTalentOuterClass.RogueTalent;
import emu.lunarcore.proto.RogueTalentStatusOuterClass.RogueTalentStatus; import emu.lunarcore.proto.RogueTalentStatusOuterClass.RogueTalentStatus;
import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.CmdId;
import emu.lunarcore.server.packet.Retcode;
import emu.lunarcore.server.packet.send.PacketLeaveRogueScRsp; import emu.lunarcore.server.packet.send.PacketLeaveRogueScRsp;
import emu.lunarcore.server.packet.send.PacketStartRogueScRsp; import emu.lunarcore.server.packet.send.PacketStartRogueScRsp;
import emu.lunarcore.server.packet.send.PacketSyncRogueFinishScNotify; import emu.lunarcore.server.packet.send.PacketSyncRogueFinishScNotify;
@@ -71,6 +72,12 @@ public class RogueManager extends BasePlayerManager {
} }
public void startRogue(int areaId, int aeonId, RepeatedInt avatarIdList) { public void startRogue(int areaId, int aeonId, RepeatedInt avatarIdList) {
// Check if map gen is loaded
if (GameDepot.getRogueMapGen().size() == 0) {
getPlayer().sendPacket(new PacketStartRogueScRsp(Retcode.ROGUE_AREA_INVALID.getVal()));
return;
}
// Make sure player already isnt in a rogue instance // Make sure player already isnt in a rogue instance
if (getPlayer().getRogueInstance() != null) { if (getPlayer().getRogueInstance() != null) {
getPlayer().sendPacket(new PacketStartRogueScRsp()); getPlayer().sendPacket(new PacketStartRogueScRsp());

8
src/main/java/emu/lunarcore/server/packet/send/PacketStartRogueScRsp.java
View File

@@ -4,20 +4,22 @@ import emu.lunarcore.game.player.Player;
import emu.lunarcore.proto.StartRogueScRspOuterClass.StartRogueScRsp; import emu.lunarcore.proto.StartRogueScRspOuterClass.StartRogueScRsp;
import emu.lunarcore.server.packet.BasePacket; import emu.lunarcore.server.packet.BasePacket;
import emu.lunarcore.server.packet.CmdId; import emu.lunarcore.server.packet.CmdId;
import lombok.SneakyThrows;
public class PacketStartRogueScRsp extends BasePacket { public class PacketStartRogueScRsp extends BasePacket {
public PacketStartRogueScRsp() { public PacketStartRogueScRsp() {
this(1);
}
public PacketStartRogueScRsp(int retcode) {
super(CmdId.StartRogueScRsp); super(CmdId.StartRogueScRsp);
var data = StartRogueScRsp.newInstance() var data = StartRogueScRsp.newInstance()
.setRetcode(1); .setRetcode(retcode);
this.setData(data); this.setData(data);
} }
@SneakyThrows
public PacketStartRogueScRsp(Player player) { public PacketStartRogueScRsp(Player player) {
super(CmdId.StartRogueScRsp); super(CmdId.StartRogueScRsp);