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.
This PR fixes the following issue: #2591 (Fast Travel deducts gold even if travel is canceled)
Pretty straight forward. Moved the code to deduct the gold into a separate method,
DaggerfallTravelPopUp.DeductFastTravelGold
. Rather than invoking directly from update, I opted to do so inDaggerfallTravelPopUp.performFastTravel
, as that method seemed to be where most of the other related changes toGameManager.Instance.PlayerEntity
state occur. The only concern I have is related to theDaggerfallTravelPopUp.OnPreFastTravel
andDaggerfallTravelPopUp.OnPostFastTravel
events. Previously, the gold was deducted prior to either event being fired. InperformFastTravel
, I put it afterOnPreFastTravel
, as that seemed to make the most sense. Looking at the codebase, I did not see any subscribers toOnPreFastTravel
, so I don't think this will break anything.