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

Update to 1.4.0

Browse Source
This commit is contained in:
Melledy
2023-10-14 09:51:57 -07:00
parent 003ccc1580
commit d32b04967e
159 changed files with 15274 additions and 20662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/lunarcore/GameConstants.java
View File

@@ -4,8 +4,8 @@ import java.time.Instant;
import java.time.ZoneOffset;
public class GameConstants {
public static String VERSION = "1.3.0";
public static String MDK_VERSION = "5377911";
public static String VERSION = "1.4.0";
public static String MDK_VERSION = "";
public static final ZoneOffset CURRENT_OFFSET = ZoneOffset.systemDefault().getRules().getOffset(Instant.now());

6
src/main/java/emu/lunarcore/game/battle/BattleService.java
View File

@@ -30,7 +30,7 @@ public class BattleService extends BaseGameService {
super(server);
}
public void startBattle(Player player, int attackerId, int attackedGroupId, boolean castedSkill, RepeatedInt attackedList) {
public void startBattle(Player player, int casterId, int attackedGroupId, boolean castedSkill, RepeatedInt attackedList) {
// Sanity check to make sure player isnt in a battle
if (player.isInBattle()) {
player.sendPacket(new PacketSceneCastSkillScRsp());
@@ -44,7 +44,7 @@ public class BattleService extends BaseGameService {
boolean isPlayerCaster = false; // Set true if the player is the one casting
// Check if attacker is the player or not
if (player.getScene().getAvatarEntityIds().contains(attackerId)) {
if (player.getScene().getAvatarEntityIds().contains(casterId)) {
// Attacker is the player
for (int entityId : attackedList) {
GameEntity entity = player.getScene().getEntities().get(entityId);
@@ -57,7 +57,7 @@ public class BattleService extends BaseGameService {
isPlayerCaster = true;
} else {
// Player is ambushed
GameEntity entity = player.getScene().getEntities().get(attackerId);
GameEntity entity = player.getScene().getEntities().get(casterId);
if (entity != null) {
entities.add(entity);

1969
src/main/java/emu/lunarcore/server/packet/CmdId.java
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/emu/lunarcore/server/packet/recv/HandlerPlayerGetTokenCsReq.java
View File

@@ -20,7 +20,7 @@ public class HandlerPlayerGetTokenCsReq extends PacketHandler {
var req = PlayerGetTokenCsReq.parseFrom(data);
// Authenticate
Account account = LunarRail.getAccountDatabase().getObjectByField(Account.class, "_id", req.getUid());
Account account = LunarRail.getAccountDatabase().getObjectByField(Account.class, "_id", req.getAccountUid());
if (account == null || !account.getComboToken().equals(req.getToken())) {
return;
}

4
src/main/java/emu/lunarcore/server/packet/recv/HandlerSceneCastSkillCsReq.java
View File

@@ -20,7 +20,7 @@ public class HandlerSceneCastSkillCsReq extends PacketHandler {
boolean castedSkill = false;
// Check if player casted a maze skill
if (req.getSkillIndex() > 0 && session.getPlayer().getScene().getAvatarEntityIds().contains(req.getAttackerId())) {
if (req.getSkillIndex() > 0 && session.getPlayer().getScene().getAvatarEntityIds().contains(req.getCasterId())) {
// Spend one skill point
session.getPlayer().getCurrentLineup().removeMp(1);
session.send(new PacketSceneCastSkillMpUpdateScNotify(req.getAttackedGroupId(), session.getPlayer().getLineupManager().getMp()));
@@ -35,7 +35,7 @@ public class HandlerSceneCastSkillCsReq extends PacketHandler {
}
if (req.hasAttackedEntityIdList()) {
session.getServer().getBattleService().startBattle(session.getPlayer(), req.getAttackerId(), req.getAttackedGroupId(), castedSkill, req.getAttackedEntityIdList());
session.getServer().getBattleService().startBattle(session.getPlayer(), req.getCasterId(), req.getAttackedGroupId(), castedSkill, req.getAttackedEntityIdList());
} else {
session.send(new PacketSceneCastSkillScRsp(req.getAttackedGroupId()));
}

1
src/main/java/emu/lunarcore/server/packet/send/PacketPVEBattleResultScRsp.java
View File

@@ -32,6 +32,7 @@ public class PacketPVEBattleResultScRsp extends BasePacket {
// Battle result
var data = PVEBattleResultScRsp.newInstance()
.setUnk1(ItemList.newInstance())
.setUnk2(ItemList.newInstance())
.setUnk3(ItemList.newInstance())
.setDropData(dropData)
.setResVersion(Integer.toString(req.getClientResVersion()))

2
src/main/java/emu/lunarcore/server/packet/send/PacketSetHeadIconScRsp.java
View File

@@ -19,7 +19,7 @@ public class PacketSetHeadIconScRsp extends BasePacket {
super(CmdId.SetHeadIconScRsp);
var data = SetHeadIconScRsp.newInstance()
.setId(headIconId);
.setCurrentHeadIconId(headIconId);
this.setData(data);
}