diff --git a/src/main/java/emu/lunarcore/game/battle/BattleService.java b/src/main/java/emu/lunarcore/game/battle/BattleService.java index 02eeadf..47d3b60 100644 --- a/src/main/java/emu/lunarcore/game/battle/BattleService.java +++ b/src/main/java/emu/lunarcore/game/battle/BattleService.java @@ -136,8 +136,8 @@ public class BattleService extends BaseGameService { } // Challenge - if (player.getChallengeData() != null) { - player.getChallengeData().onBattleStart(battle); + if (player.getChallengeInstance() != null) { + player.getChallengeInstance().onBattleStart(battle); } // Set battle and send rsp packet @@ -268,8 +268,8 @@ public class BattleService extends BaseGameService { } // Challenge - if (player.getChallengeData() != null) { - player.getChallengeData().onBattleFinish(battle, result, stats); + if (player.getChallengeInstance() != null) { + player.getChallengeInstance().onBattleFinish(battle, result, stats); } // Done - Clear battle object from player diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeData.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java similarity index 97% rename from src/main/java/emu/lunarcore/game/challenge/ChallengeData.java rename to src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java index 007abe9..f6e2092 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeData.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java @@ -21,7 +21,7 @@ import lombok.Getter; import lombok.Setter; @Getter -public class ChallengeData { +public class ChallengeInstance { private final Player player; private final Scene scene; private final ChallengeExcel excel; @@ -36,7 +36,7 @@ public class ChallengeData { @Setter private int roundsLeft; @Setter private int stars; - public ChallengeData(Player player, ChallengeExcel excel) { + public ChallengeInstance(Player player, ChallengeExcel excel) { this.player = player; this.scene = player.getScene(); this.excel = excel; @@ -117,7 +117,7 @@ public class ChallengeData { } public void onBattleStart(Battle battle) { - battle.setRoundsLimit(player.getChallengeData().getRoundsLeft()); + battle.setRoundsLimit(player.getChallengeInstance().getRoundsLeft()); } public void onBattleFinish(Battle battle, BattleEndStatus result, BattleStatistics stats) { @@ -166,7 +166,7 @@ public class ChallengeData { public void onUpdate() { // End challenge if its done if (status != ChallengeStatus.CHALLENGE_DOING) { - getPlayer().setChallengeData(null); + getPlayer().setChallengeInstance(null); } } diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java index f84908b..3cae95c 100644 --- a/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java +++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeManager.java @@ -68,8 +68,8 @@ public class ChallengeManager extends BasePlayerManager { } // Set challenge data for player - ChallengeData data = new ChallengeData(getPlayer(), excel); - getPlayer().setChallengeData(data); + ChallengeInstance data = new ChallengeInstance(getPlayer(), excel); + getPlayer().setChallengeInstance(data); // Send packet getPlayer().sendPacket(new PacketStartChallengeScRsp(getPlayer(), challengeId)); diff --git a/src/main/java/emu/lunarcore/game/player/Player.java b/src/main/java/emu/lunarcore/game/player/Player.java index 8e09bd7..c4af633 100644 --- a/src/main/java/emu/lunarcore/game/player/Player.java +++ b/src/main/java/emu/lunarcore/game/player/Player.java @@ -20,7 +20,7 @@ import emu.lunarcore.game.avatar.AvatarStorage; import emu.lunarcore.game.avatar.GameAvatar; import emu.lunarcore.game.avatar.HeroPath; import emu.lunarcore.game.battle.Battle; -import emu.lunarcore.game.challenge.ChallengeData; +import emu.lunarcore.game.challenge.ChallengeInstance; import emu.lunarcore.game.challenge.ChallengeManager; import emu.lunarcore.game.chat.ChatManager; import emu.lunarcore.game.chat.ChatMessage; @@ -28,7 +28,7 @@ import emu.lunarcore.game.enums.PropState; import emu.lunarcore.game.gacha.PlayerGachaInfo; import emu.lunarcore.game.inventory.Inventory; import emu.lunarcore.game.mail.Mailbox; -import emu.lunarcore.game.rogue.RogueData; +import emu.lunarcore.game.rogue.RogueInstance; import emu.lunarcore.game.rogue.RogueManager; import emu.lunarcore.game.scene.Scene; import emu.lunarcore.game.scene.entity.EntityProp; @@ -97,8 +97,8 @@ public class Player { private transient int nextBattleId; @Setter private transient boolean paused; - @Setter private transient ChallengeData challengeData; - @Setter private transient RogueData rogueData; + @Setter private transient ChallengeInstance challengeInstance; + @Setter private transient RogueInstance rogueInstance; @Deprecated // Morphia only public Player() { @@ -483,7 +483,7 @@ public class Player { } // Clear any extra data the player might have - this.setChallengeData(null); + this.setChallengeInstance(null); // Set positions if player has logged in if (this.getSession().getState() != SessionState.WAITING_FOR_TOKEN) { diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java b/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java index f608d35..176cda8 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java @@ -13,7 +13,7 @@ public class RogueEntityLoader extends SceneEntityLoader { public EntityMonster loadMonster(Scene scene, GroupInfo group, MonsterInfo monsterInfo) { // Make sure player is in a rogue instance - RogueData rogue = scene.getPlayer().getRogueData(); + RogueInstance rogue = scene.getPlayer().getRogueInstance(); if (rogue == null) return null; // Get rogue group content diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueData.java b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java similarity index 96% rename from src/main/java/emu/lunarcore/game/rogue/RogueData.java rename to src/main/java/emu/lunarcore/game/rogue/RogueInstance.java index e284347..4f487cc 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueData.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java @@ -13,7 +13,7 @@ import emu.lunarcore.proto.RogueStatusOuterClass.RogueStatus; import lombok.Getter; @Getter -public class RogueData { +public class RogueInstance { private transient Player player; private transient RogueAreaExcel excel; @@ -22,7 +22,7 @@ public class RogueData { private Set baseAvatarIds; private TreeMap rooms; - public RogueData(Player player, RogueAreaExcel excel) { + public RogueInstance(Player player, RogueAreaExcel excel) { this.player = player; this.excel = excel; this.currentRoomProgress = 1; diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java index 850fbd0..2d73179 100644 --- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java +++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java @@ -31,7 +31,7 @@ public class RogueManager extends BasePlayerManager { public void startRogue(int areaId, RepeatedInt avatarIdList) { // Make sure player already isnt in a rogue instance - if (getPlayer().getRogueData() != null) { + if (getPlayer().getRogueInstance() != null) { getPlayer().sendPacket(new PacketStartRogueScRsp()); return; } @@ -54,7 +54,7 @@ public class RogueManager extends BasePlayerManager { } // Get entrance id - RogueData data = new RogueData(getPlayer(), excel); + RogueInstance data = new RogueInstance(getPlayer(), excel); int entranceId = data.getCurrentRoom().getRoomExcel().getMapEntrance(); // Reset hp/sp @@ -80,7 +80,7 @@ public class RogueManager extends BasePlayerManager { } // Set rogue data - getPlayer().setRogueData(data); + getPlayer().setRogueInstance(data); // Get room excel RogueRoomExcel roomExcel = data.getCurrentRoom().getExcel(); @@ -102,12 +102,12 @@ public class RogueManager extends BasePlayerManager { } public void quitRogue() { - if (getPlayer().getRogueData() == null) { + if (getPlayer().getRogueInstance() == null) { getPlayer().getSession().send(CmdId.QuitRogueScRsp); return; } - getPlayer().setRogueData(null); + getPlayer().setRogueInstance(null); getPlayer().enterScene(GameConstants.ROGUE_LEAVE_ENTRANCE, 0, true); // Test getPlayer().getSession().send(CmdId.QuitRogueScRsp); } @@ -145,10 +145,10 @@ public class RogueManager extends BasePlayerManager { .setEndTime(endTime); // Rogue data - RogueData curRogue = this.getPlayer().getRogueData(); + RogueInstance curRogue = this.getPlayer().getRogueInstance(); if (curRogue != null) { proto.setStatus(curRogue.getStatus()); - proto.setRogueProgress(this.getPlayer().getRogueData().toProto()); + proto.setRogueProgress(this.getPlayer().getRogueInstance().toProto()); proto.setRoomMap(proto.getRogueProgress().getRoomMap()); for (int id : curRogue.getBaseAvatarIds()) { diff --git a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetCurChallengeCsReq.java b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetCurChallengeCsReq.java index da96c11..26fb78b 100644 --- a/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetCurChallengeCsReq.java +++ b/src/main/java/emu/lunarcore/server/packet/recv/HandlerGetCurChallengeCsReq.java @@ -14,8 +14,8 @@ public class HandlerGetCurChallengeCsReq extends PacketHandler { // Send packet first session.send(new PacketGetCurChallengeScRsp(session.getPlayer())); // Update challenge details for client - if (session.getPlayer().getChallengeData() != null) { - session.getPlayer().getChallengeData().onUpdate(); + if (session.getPlayer().getChallengeInstance() != null) { + session.getPlayer().getChallengeInstance().onUpdate(); } } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketChallengeSettleNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketChallengeSettleNotify.java index f06bf92..6fa4082 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketChallengeSettleNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketChallengeSettleNotify.java @@ -1,6 +1,6 @@ package emu.lunarcore.server.packet.send; -import emu.lunarcore.game.challenge.ChallengeData; +import emu.lunarcore.game.challenge.ChallengeInstance; import emu.lunarcore.proto.ChallengeSettleNotifyOuterClass.ChallengeSettleNotify; import emu.lunarcore.proto.ItemListOuterClass.ItemList; import emu.lunarcore.server.packet.BasePacket; @@ -8,7 +8,7 @@ import emu.lunarcore.server.packet.CmdId; public class PacketChallengeSettleNotify extends BasePacket { - public PacketChallengeSettleNotify(ChallengeData challenge) { + public PacketChallengeSettleNotify(ChallengeInstance challenge) { super(CmdId.ChallengeSettleNotify); var data = ChallengeSettleNotify.newInstance() diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketGetCurChallengeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketGetCurChallengeScRsp.java index 2232125..4cdb49b 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketGetCurChallengeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketGetCurChallengeScRsp.java @@ -12,8 +12,8 @@ public class PacketGetCurChallengeScRsp extends BasePacket { var data = GetCurChallengeScRsp.newInstance(); - if (player.getChallengeData() != null) { - data.setChallengeInfo(player.getChallengeData().toProto()); + if (player.getChallengeInstance() != null) { + data.setChallengeInfo(player.getChallengeInstance().toProto()); } else { data.setRetcode(0); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java index 337e914..a82888e 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketStartChallengeScRsp.java @@ -21,10 +21,10 @@ public class PacketStartChallengeScRsp extends BasePacket { var data = StartChallengeScRsp.newInstance(); - if (player.getChallengeData() != null) { + if (player.getChallengeInstance() != null) { data.setLineup(player.getCurrentLineup().toProto()); data.setScene(player.getScene().toProto()); - data.setChallengeInfo(player.getChallengeData().toProto()); + data.setChallengeInfo(player.getChallengeInstance().toProto()); } else { data.setRetcode(1); } diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMapRoomScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMapRoomScNotify.java index 303df24..eacbac5 100644 --- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMapRoomScNotify.java +++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMapRoomScNotify.java @@ -12,9 +12,9 @@ public class PacketSyncRogueMapRoomScNotify extends BasePacket { var data = SyncRogueMapRoomScNotify.newInstance(); - if (player.getRogueData() != null) { - data.setMapId(player.getRogueData().getExcel().getMapId()); - data.setCurRoom(player.getRogueData().getCurrentRoom().toProto()); + if (player.getRogueInstance() != null) { + data.setMapId(player.getRogueInstance().getExcel().getMapId()); + data.setCurRoom(player.getRogueInstance().getCurrentRoom().toProto()); } this.setData(data);