Solves for WarZoneListener being unused. #86
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
Towny was never assigning TownBlockStatus#WARZONE in the PlayerCacheUtil, because at some point it was made to only respect EventWar. This PR removes FlagWar's add/removes to TownyUniverse's #addWarZone and #removeWarZone methods, which would trickle down into the TownyWorld warzone map, affecting TownBlock#isWarZone. The above TownyWorld and TownyUniverse are due to be scrapped with the EventWar revamp anyways, and FlagWarAPI#isUnderAttack already does a great of tracking where FlagWar flags are placed. The WarZoneListener#isFastFailing has been rejiggered to look for the above FlagWar#isUnderAttack and instead of testing for a TownBlockStatus#WARZONE, it is checking the PlayerCache if an ENEMY status is returned, which should mean it will fail fast in many scenarios.
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.
Brief Description:
Towny was never assigning TownBlockStatus#WARZONE in the
PlayerCacheUtil, because at some point it was made to only respect
EventWar.
This PR removes FlagWar's add/removes to TownyUniverse's #addWarZone and
#removeWarZone methods, which would trickle down into the TownyWorld
warzone map, affecting TownBlock#isWarZone.
Changes:
The above TownyWorld and TownyUniverse are due to be scrapped with the
EventWar revamp anyways, and FlagWarAPI#isUnderAttack already does a
great of tracking where FlagWar flags are placed.
The WarZoneListener#isFastFailing has been rejiggered to look for the
above FlagWar#isUnderAttack and instead of testing for a
TownBlockStatus#WARZONE, it is checking the PlayerCache if an ENEMY
status is returned, which should mean it will fail fast in many
scenarios.
Relevant FlagWar Issue tickets:
By making this pull request, I represent that I have read and agree to release my own changes that I
have submitted under the terms of the accompanying license (Apache-2.0). I guarantee that these
changes are mine and are not encumbered by any other license or restriction to the best of my
knowledge.