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

Fix wrong materials used for emblem generation

Browse Source
This commit is contained in:
Melledy
2025-12-13 16:11:51 -08:00
parent 4d14099f11
commit e5ffb1743a
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/nebula/data/resources/CharGemDef.java
View File

@@ -1,7 +1,6 @@
package emu.nebula.data.resources;
import emu.nebula.data.BaseDef;
import emu.nebula.data.GameData;
import emu.nebula.data.ResourceType;
import lombok.Getter;
@@ -17,8 +16,4 @@ public class CharGemDef extends BaseDef {
public int getId() {
return Id;
}
public CharGemSlotControlDef getControlData() {
return GameData.getCharGemSlotControlDataTable().get(this.Type);
}
}

4
src/main/java/emu/nebula/data/resources/CharacterDef.java
View File

@@ -1,6 +1,5 @@
package emu.nebula.data.resources;
import java.util.Arrays;
import java.util.List;
import emu.nebula.data.BaseDef;
@@ -62,8 +61,5 @@ public class CharacterDef extends BaseDef {
public void onLoad() {
this.elementType = ElementType.getByValue(this.EET);
this.chats = new ObjectArrayList<>();
// Sort gem slots
this.GemSlots = Arrays.stream(this.GemSlots).sorted().toArray();
}
}

6
src/main/java/emu/nebula/game/character/CharacterStorage.java
View File

@@ -275,7 +275,8 @@ public class CharacterStorage extends PlayerManager {
this.updateCharHandbook = false;
this.getPlayer().addNextPackage(
NetMsgId.handbook_change_notify,
this.getPlayer().getCharacters().getCharacterHandbook());
this.getCharacterHandbook()
);
}
// Check if we need to trigger disc achievements
@@ -298,7 +299,8 @@ public class CharacterStorage extends PlayerManager {
this.updateDiscHandbook = false;
this.getPlayer().addNextPackage(
NetMsgId.handbook_change_notify,
this.getPlayer().getCharacters().getDiscHandbook());
this.getDiscHandbook()
);
}
}

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

@@ -675,7 +675,11 @@ public class GameCharacter implements GameDatabaseObject {
// Get gem data
var gemData = this.getData().getCharGemData(slotId);
var gemControl = gemData.getControlData();
var gemControl = GameData.getCharGemSlotControlDataTable().get(slotId);
if (gemControl == null) {
throw new ServerException(110105, "Emblem slot data doesn't exist");
}
// Check character level
if (this.getLevel() < gemControl.getUnlockLevel()) {
@@ -717,7 +721,11 @@ public class GameCharacter implements GameDatabaseObject {
// Get gem data
var gemData = this.getData().getCharGemData(slotId);
var gemControl = gemData.getControlData();
var gemControl = GameData.getCharGemSlotControlDataTable().get(slotId);
if (gemControl == null) {
throw new ServerException(110105, "Emblem slot data doesn't exist");
}
// Check character level
if (this.getLevel() < gemControl.getUnlockLevel()) {

3
src/main/java/emu/nebula/net/GameSession.java
View File

@@ -209,7 +209,8 @@ public class GameSession {
// Send mail state notify
this.getPlayer().addNextPackage(
NetMsgId.mail_state_notify,
MailState.newInstance().setNew(true));
MailState.newInstance().setNew(true)
);
}
// Check handbook states