Mirror/Nebula
1
0
Fork 0
mirror of https://github.com/Melledy/Nebula.git synced 2025-12-12 12:24:35 +01: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

21
src/main/java/emu/nebula/game/character/GameCharacter.java
View File

@@ -33,6 +33,7 @@ import emu.nebula.proto.Public.CharGemSlot;
import emu.nebula.proto.Public.UI32;
import emu.nebula.proto.PublicStarTower.StarTowerChar;
import emu.nebula.proto.PublicStarTower.StarTowerCharGem;
import emu.nebula.server.error.ServerException;
import emu.nebula.util.Bitset;
import emu.nebula.util.CustomIntArray;
import it.unimi.dsi.fastutil.ints.IntArrayList;
@@ -660,16 +661,16 @@ public class GameCharacter implements GameDatabaseObject {
return true;
}
public synchronized PlayerChangeInfo generateGem(int slotId) {
public synchronized PlayerChangeInfo generateGem(int slotId) throws ServerException {
// Get gem slot
var slot = this.getGemSlot(slotId);
if (slot == null) {
return null;
throw new ServerException(110105, "Emblem slot doesn't exist");
}
// Skip if slot is full
if (slot.isFull()) {
return null;
throw new ServerException(110105, "Emblem slots are full");
}
// Get gem data
@@ -678,12 +679,12 @@ public class GameCharacter implements GameDatabaseObject {
// Check character level
if (this.getLevel() < gemControl.getUnlockLevel()) {
return null;
throw new ServerException(110105, "Trekker needs to be at least level " + gemControl.getUnlockLevel());
}
// Make sure the player has the materials to craft the emblem
if (!getPlayer().getInventory().hasItem(gemData.getGenerateCostTid(), gemControl.getGeneratenCostQty())) {
return null;
throw new ServerException(119903);
}
// Generate attributes and create gem
@@ -707,10 +708,12 @@ public class GameCharacter implements GameDatabaseObject {
}
@SuppressWarnings("deprecation")
public synchronized PlayerChangeInfo refreshGem(int slotId, int gemIndex, RepeatedInt lockedAttributes) {
public synchronized PlayerChangeInfo refreshGem(int slotId, int gemIndex, RepeatedInt lockedAttributes) throws ServerException {
// Get gem from slot
var gem = this.getGemFromSlot(slotId, gemIndex);
if (gem == null) return null;
if (gem == null) {
throw new ServerException(111609);
}
// Get gem data
var gemData = this.getData().getCharGemData(slotId);
@@ -718,12 +721,12 @@ public class GameCharacter implements GameDatabaseObject {
// Check character level
if (this.getLevel() < gemControl.getUnlockLevel()) {
return null;
throw new ServerException(110105, "Trekker needs to be at least level " + gemControl.getUnlockLevel());
}
// Get locked attributes
if (lockedAttributes.length() > gemControl.getLockableNum()) {
return null;
throw new ServerException(110105, "You can only lock up to " + gemControl.getLockableNum() + " attributes");
}
// Calculate the materials we need

33
src/main/java/emu/nebula/server/error/ServerException.java Normal file
View File

@@ -0,0 +1,33 @@
package emu.nebula.server.error;
import lombok.Getter;
import emu.nebula.proto.Public.Error;
@Getter
public class ServerException extends Exception {
private static final long serialVersionUID = -8953641375717705518L;
private int code;
private String[] args;
public ServerException(int code) {
this.code = code;
}
public ServerException(int code, String... args) {
this.code = code;
this.args = args;
}
// Proto
public Error toProto() {
var proto = Error.newInstance()
.setCode(code);
if (this.args != null) {
proto.addAllArguments(args);
}
return proto;
}
}

10
src/main/java/emu/nebula/server/handlers/HandlerCharGemGenerateReq.java
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();

10
src/main/java/emu/nebula/server/handlers/HandlerCharGemRefreshReq.java
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();