Fix f_onchar_delete not launch when delete account #1031
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cbnolok
force-pushed
the
master
branch
12 times, most recently
from
04f1ff5
to
56363a7
Compare
cbnolok
reviewed
Sep 22, 2023
src/game/chars/CChar.cpp
Outdated
| @@ -429,7 +429,7 @@ bool CChar::Delete(bool fForce) | |||
| { | |||
| ADDTOCALLSTACK("CChar::Delete"); | |||
|
|
|||
| if ((NotifyDelete() == false) && !fForce) | |||
| if ((NotifyDelete(0) == false) && !fForce) | |||
cbnolok
reviewed
Sep 22, 2023
src/game/clients/CAccount.cpp
Outdated
| @@ -593,8 +594,9 @@ void CAccount::DeleteChars() | |||
| CChar * pChar = m_Chars.GetChar(--i).CharFind(); | |||
| if (pChar != nullptr) | |||
| { | |||
| pChar->NotifyDelete(1); | |||
There was a problem hiding this comment.
This is not needed, since it's already called by CChar::Delete, and you can pass fForce there
|
I tested for different way and seem work correctly. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #1029
Need to be review. DeleteChars() was already on this function:
CAccount::~CAccount()
But this function seem to never be use so I added the DeleteChars(); in the account delete function.
Since we want a notification in script, I mannualy add NotifyDelete(1) and add a bool value to block the return 1 function in the @f_onchar_delete or @destroy trigger. Without this check, If this return is present, we get an infinite while loop.