Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2026-09-20 01:29:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show errors properly if emblem creation/reroll fails

Browse Source
This commit is contained in:
Melledy
2025-12-12 02:06:11 -08:00
parent 353d7d97b6
commit 968880c320
4 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/nebula/server/handlers/HandlerCharGemGenerateReq.java
+7 -3
View File
@@ -4,8 +4,10 @@ import emu.nebula.net.NetHandler;
import emu.nebula.net.NetMsgId;
import emu.nebula.proto.CharGemGenerate.CharGemGenerateReq;
import emu.nebula.proto.CharGemGenerate.CharGemGenerateResp;
import emu.nebula.server.error.ServerException;
import emu.nebula.net.HandlerId;
import emu.nebula.game.character.CharacterGem;
import emu.nebula.game.player.PlayerChangeInfo;
import emu.nebula.net.GameSession;
@HandlerId(NetMsgId.char_gem_generate_req)
@@ -23,10 +25,12 @@ public class HandlerCharGemGenerateReq extends NetHandler {
}
// Generate gem
var change = character.generateGem(req.getSlotId());
PlayerChangeInfo change = null;
if (change == null) {
return session.encodeMsg(NetMsgId.char_gem_generate_failed_ack);
try {
change = character.generateGem(req.getSlotId());
} catch (ServerException e) {
return session.encodeMsg(NetMsgId.char_gem_generate_failed_ack, e.toProto());
}
var gem = (CharacterGem) change.getExtraData();
src/main/java/emu/nebula/server/handlers/HandlerCharGemRefreshReq.java
+7 -3
View File
@@ -4,8 +4,10 @@ import emu.nebula.net.NetHandler;
import emu.nebula.net.NetMsgId;
import emu.nebula.proto.CharGemRefresh.CharGemRefreshReq;
import emu.nebula.proto.CharGemRefresh.CharGemRefreshResp;
import emu.nebula.server.error.ServerException;
import emu.nebula.net.HandlerId;
import emu.nebula.game.character.CharacterGem;
import emu.nebula.game.player.PlayerChangeInfo;
import emu.nebula.net.GameSession;
@HandlerId(NetMsgId.char_gem_refresh_req)
@@ -24,10 +26,12 @@ public class HandlerCharGemRefreshReq extends NetHandler {
}
// Refresh gem attributes
var change = character.refreshGem(req.getSlotId(), req.getGemIndex(), req.getLockAttrs());
PlayerChangeInfo change = null;
if (change == null) {
return session.encodeMsg(NetMsgId.char_gem_refresh_failed_ack);
try {
change = character.refreshGem(req.getSlotId(), req.getGemIndex(), req.getLockAttrs());
} catch (ServerException e) {
return session.encodeMsg(NetMsgId.char_gem_refresh_failed_ack, e.toProto());
}
var gem = (CharacterGem) change.getExtraData();