-
-
Notifications
You must be signed in to change notification settings - Fork 356
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.
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
Invite Cleanup #4269
Merged
Merged
Invite Cleanup #4269
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
& clean up jailing methods requiring a resident/player, & clear up javadocs in TownyMessaging.
LlmDl
approved these changes
Aug 18, 2020
silverwolfg11
approved these changes
Aug 19, 2020
LlmDl
added a commit
that referenced
this pull request
Aug 21, 2020
- Removes towns.txt and nations.txt files on flatfile databases. - Loads old towns.txt and nations.txt to ensure that orphaned files in the towns & nations folders are not loaded. If successfully loaded, the towns.txt and nations.txt files are deleted. - Residents now store their Town, and Towns do not store their Residents. - Towns now store their Nation, and Nations do not store their Towns. - Towny now handles loading a mayor for a town intelligently. - If a town attempts to set a mayor who is not part of the town, and the town has no residents, the town will be deleted. - Closes #4170. - Towny now handles loading the capital of a nation intelligently. - Little fixes for TownySQLSource: - Hit TownySQLSource with the formatting stick. - Add tar/tar.gz backups to the backup code. - Make deletePlotGroup actually do something. - Invite Cleanup, courtesy of Siris with PR #4269. - Cleanup Confirmation class and properly implement async, courtesy of Siris with PR #4280. - Remove Secondary POM file, courtesy of TheFlagCourier with PR #4278.
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:
This PR cleans up the
Invite
objects quite a bit by introducing a newAbstractInvite<S,R>
to consolidate redundant invite code. In additiongetDirectSender()
now returns aCommandSender
as opposed to justString
. This allows us to just pass in the rawPlayer
object without trying to get the name. Because of this some of the messaging methods have been modified to acceptCommandSender
. Even with these additional fixes, this PR will shrink the codebase by about ~30 lines.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.