fix issues with /ps flag, update /ps admin Ui #438
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -118,8 +118,8 @@ private boolean openFlagGUI(Player p, PSRegion r, int page) { | |||||
| } | ||||||
|
|
||||||
| // add line based on flag type | ||||||
| boolean isGroupValueAll = groupfValue.equalsIgnoreCase("all") || groupfValue.isEmpty();; | ||||||
|
Owner
There was a problem hiding this comment.
Suggested change
|
||||||
| if (f instanceof StateFlag) { // allow/deny | ||||||
|
|
||||||
| TextComponent allow = new TextComponent((fValue == StateFlag.State.ALLOW ? ChatColor.WHITE : ChatColor.DARK_GRAY) + "Allow"), | ||||||
| deny = new TextComponent((fValue == StateFlag.State.DENY ? ChatColor.WHITE : ChatColor.DARK_GRAY) + "Deny"); | ||||||
|
|
@@ -138,14 +138,6 @@ private boolean openFlagGUI(Player p, PSRegion r, int page) { | |||||
| deny.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, suggestedCommand + flagGroup + page + ":" + flag + " deny")); | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
| flagLine.addExtra(allow); | ||||||
| flagLine.addExtra(" "); | ||||||
|
|
@@ -193,15 +185,27 @@ private boolean openFlagGUI(Player p, PSRegion r, int page) { | |||||
|
|
||||||
| // set hover and click task for flag group | ||||||
| BaseComponent[] hover; | ||||||
| // HACK: Prevent pvp flag value from being changed to none/null | ||||||
| // Special handling for "pvp" flag with "all" group, disabling interaction. | ||||||
| if (flag.equalsIgnoreCase("pvp") && isGroupValueAll) { | ||||||
| hover = new ComponentBuilder(PSL.FLAG_PREVENT_EXPLOIT_HOVER.msg()).create(); | ||||||
| // Remove click action to fully disable changing this group. | ||||||
| groupChange.setClickEvent(null); | ||||||
| } else if (fValue == null) { | ||||||
| hover = new ComponentBuilder(PSL.FLAG_GUI_HOVER_CHANGE_GROUP_NULL.msg()).create(); | ||||||
| } else { | ||||||
| hover = new ComponentBuilder(PSL.FLAG_GUI_HOVER_CHANGE_GROUP.msg().replace("%group%", nextGroup)).create(); | ||||||
| } | ||||||
|
|
||||||
| // Always set hover if the flag is pvp and group is "all" | ||||||
| if (flag.equalsIgnoreCase("pvp") && groupfValue.equalsIgnoreCase("all")) { | ||||||
| hover = new ComponentBuilder(PSL.FLAG_PREVENT_EXPLOIT_HOVER.msg()).create(); | ||||||
| groupChange.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover)); | ||||||
| groupChange.setClickEvent(null); // Disable click event explicitly | ||||||
| } else if (!nextGroup.equals(groupfValue)) { | ||||||
| groupChange.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover)); | ||||||
| groupChange.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, suggestedCommand + "-g " + nextGroup + " " + page + ":" + flag + " " + fValue)); | ||||||
| } | ||||||
|
|
||||||
| flagLine.addExtra(groupChange); | ||||||
| // send message | ||||||
|
|
||||||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,6 @@ | |
| import org.bukkit.event.Event; | ||
| import org.bukkit.event.HandlerList; | ||
| import org.bukkit.inventory.ItemStack; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
|
|
@@ -65,7 +64,6 @@ public void setCancelled(boolean cancel) { | |
| isCancelled = cancel; | ||
| } | ||
|
|
||
| @Override | ||
| public HandlerList getHandlers() { | ||
| return HANDLERS; | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| name: ProtectionStones | ||
| version: ${version} | ||
| description: ${description} | ||
| authors: [EspiDev, Jerzean] | ||
|
|
||
| depend: [WorldGuard, WorldEdit] | ||
| softdepend: [Vault, PlaceholderAPI, LuckPerms] | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to bump the Spigot API version? This would make the plugin incompatible with servers still on 1.20.6-1.21.4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
spigot uses "api-version:" in the plugin.yml not the version it was built with, protectionstones currently has "api-version: 1.17" which means it will load with spigot 1.17-1.21.5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we be updating the plugin.yml then? I think we should do this version bump in a separate PR to better be able to test the side effects of bumping the version since we won't have their compatibility mode