Skip to content
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

renewed fix: update error message of /p remove <player> if player does not need to be removed #4592

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

TheJonstone
Copy link

Overview

This pull request update an error message that was already included in pull request #3734 in PlotSquared v6.
Unfortunately, the change from back then was not adopted in v7, hence the request to reintegrate this change now.

Notice PR #3734 : The placeholder “member.player_not_removed” already exists.
In v7, only the reference to this placeholder is missing in the Remove.java command.

Description

Update/Changes the message if you try to remove a player from a plot, which is not added, trusted or denied from the plot to make it more clear, why the command failed.

Submitter Checklist

Preview Give feedback

@TheJonstone TheJonstone requested a review from a team as a code owner February 10, 2025 23:00
@github-actions github-actions bot added Bugfix This PR fixes a bug Feature This PR proposes a new feature labels Feb 10, 2025
@RedstoneFuture
Copy link
Member

How can it be that the old PR change is not included? The branch v6 was renamed to main.

@RedstoneFuture
Copy link
Member

RedstoneFuture commented Feb 12, 2025

The earlier merged change of Xaver was removed by mistakes with the merge-conflict resolving of commit 6efd581. GitHub doesn't show all changes of 6efd581, because the commit is too large. Here is the full patch from the IDE.

                 player.sendMessage(
-                        TranslatableCaption.of("member.player_not_removed"),
-                        Template.of("player", args[0])
+                        TranslatableCaption.of("errors.invalid_player"),
+                        TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
                 );

I have looked at all of 6efd581 modified classes. It could affect a more code changes. Perhaps more small PRs will follow.

  • Bukkit/scr/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
  • Bukkit/scr/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
  • Core/src/main/java/com/plotsquared/core/command/Biome.java
  • Core/src/main/java/com/plotsquared/core/command/Near.java
  • Core/src/main/java/com/plotsquared/core/command/Remove.java <<--
  • Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
  • Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java
  • Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java

@dordsor21 dordsor21 requested a review from a team February 15, 2025 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix This PR fixes a bug Feature This PR proposes a new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants