Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix NPE when removing character augments #277

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

fix: Fix NPE when removing character augments #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbEquippedAbility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,15 @@ public bool ReplaceEquippedAbilities(uint commonId, JobId equippedToJob, List<Ab
{
// Remove previously equipped abilities
DeleteEquippedAbilities(connection, commonId, equippedToJob);
// Insert new ones
for (byte i = 0; i < abilities.Count; i++)

for (int i = 0; i < abilities.Count; i++)
{
Ability ability = abilities[i];
var ability = abilities[i];
if (ability == null)
{
continue;
}

byte slotNo = (byte)(i + 1);
InsertEquippedAbility(connection, commonId, equippedToJob, slotNo, ability);
}
Expand Down
33 changes: 7 additions & 26 deletions Arrowgene.Ddon.GameServer/Characters/JobManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,35 +518,16 @@ public Ability SetAbility(IDatabase database, GameClient client, CharacterCommon

public void RemoveAbility(IDatabase database, CharacterCommon character, byte slotNo)
{
var equippedAbilities = character.EquippedAbilitiesDictionary[character.Job];
// TODO: Performance
List<Ability> equippedAbilities = character.EquippedAbilitiesDictionary[character.Job];
lock (equippedAbilities)
{
byte removedAbilitySlotNo = Byte.MaxValue;
for (int i = 0; i < equippedAbilities.Count; i++)
{
Ability equippedAbility = equippedAbilities[i];
byte equippedAbilitySlotNo = (byte)(i + 1);
if (character.Job == character.Job && equippedAbilitySlotNo == slotNo)
{
equippedAbilities[i] = null;
removedAbilitySlotNo = equippedAbilitySlotNo;
break;
}
}

for (int i = 0; i < equippedAbilities.Count; i++)
{
Ability equippedAbility = equippedAbilities[i];
byte equippedAbilitySlotNo = (byte)(i + 1);
if (character.Job == character.Job)
{
if (equippedAbilitySlotNo > removedAbilitySlotNo)
{
equippedAbilitySlotNo--;
}
}
}
// Seems client wants us to keep the abilities where it was added
// for the first time. So just null out the ability we want to remove
// in the position in the list. When inserting into the DB, we need to
// be careful and skip over null entries and continue to increment the
// slot index.
equippedAbilities[slotNo - 1] = null;
}

database.ReplaceEquippedAbilities(character.CommonId, character.Job, equippedAbilities);
Expand Down
Loading