-
-
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
Cleanup util classes #5348
Merged
Merged
Cleanup util classes #5348
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
Oct 7, 2021
Warriorrrr
requested changes
Oct 8, 2021
Co-authored-by: LlmDl <LlmDlio@gmail.com>
All of the new lines were not working for whatever reason.
Doesn't use PaperLib's getBedSpawnLocationAsync (yet.)
LlmDl
requested changes
Oct 15, 2021
# Conflicts: # resources/lang/en-US.yml # src/com/palmergames/bukkit/towny/TownyAPI.java # src/com/palmergames/bukkit/towny/object/jail/JailReason.java # src/com/palmergames/bukkit/towny/utils/CombatUtil.java # src/com/palmergames/bukkit/towny/utils/JailUtil.java # src/com/palmergames/bukkit/towny/utils/SpawnUtil.java
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 pull request improves code in multiple util classes.
TownyAPI#jailTeleport(final Player player, final Location location)
JailReason
JailUtil#sendJailedBookToResident(Player player, JailReason reason)
CombatUtil#isWorldPvP
JailUtil#teleportAwayFromJail
JailUtil#teleportToJail
CombatUtil#isAlly(String attackingResident, String defendingResident)
SpawnUtil#getIdealLocation(Resident resident)
SpawnUtil#jailAwayTeleport(Resident jailed)
SpawnUtil#jailTeleport(Resident jailed)
SpawnUtil#initiatePluginTeleport(Resident resident, Location loc)
CombatUtil#preventFriendlyFire(Player attacker, Player defender)
CombatUtil#isPvPPlot(Player attacker, Player defender)
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.