Handle empty towns during duplicate resident removal #7474
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
LlmDl
requested changes
Jun 18, 2024
Comment on lines
+475
to
+478
| try { | ||
| universe.unregisterTown(olderResTown); | ||
| } catch (NotRegisteredException ignored) {} | ||
| deleteTown(olderResTown); |
There was a problem hiding this comment.
Suggested change
| try { | |
| universe.unregisterTown(olderResTown); | |
| } catch (NotRegisteredException ignored) {} | |
| deleteTown(olderResTown); | |
| TownyUniverse.getInstance().getDataSource().removeTown(town, DeleteTownEvent.Cause.NO_RESIDENTS, null, false); |
There was a problem hiding this comment.
Alternatively we could just call resident.removeTown() and this would be taken care of I think.
I see the comment saying we cannot use resident.removeTown()...
There was a problem hiding this comment.
The town & townblocks are not loaded yet at this point so I figured we could get away with unregistering it and deleting the file
LlmDl
approved these changes
Jun 18, 2024
LlmDl
added a commit
that referenced
this pull request
Jun 19, 2024
galacticwarrior9 with PR #7478. - Handle empty towns during duplicate resident removal, courtesy of Warrior with PR #7474. - Add plot group creation/deletion events #7476, courtesy of Warrior with PR. - Closes #7475. - Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0. - Drop support for MC 1.16-1.18, update the readme.
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.
Description:
New Nodes/Commands/ConfigOptions:
Relevant Towny Issue ticket:
By making this pull request, I represent that I have the right to waive copyright and related rights to my contribution, and agree that all copyright and related rights in my contributions are waived, and I acknowledge that the TownyAdvanced organization has the copyright to use and modify my contribution under the Towny License for perpetuity.