Skip to content

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

Merged
dordsor21 merged 1 commit intoIntellectualSites:mainfrom
TheJonstone:feature/v7/remove-message-rework
Feb 22, 2025
Merged

renewed fix: update error message of /p remove <player> if player does not need to be removed#4592
dordsor21 merged 1 commit intoIntellectualSites:mainfrom
TheJonstone:feature/v7/remove-message-rework

Conversation

@TheJonstone
Copy link
Contributor

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
- [x] Make sure you are opening from a topic branch (**/feature/fix/docs/ branch** (right side)) and not your main branch.
- [x] Ensure that the pull request title represents the desired changelog entry.
- [x] New public fields and methods are annotated with `@since TODO`.
- [x] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md).

@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
@dordsor21 dordsor21 merged commit 4e2ea67 into IntellectualSites:main Feb 22, 2025
7 checks passed
@TheJonstone TheJonstone deleted the feature/v7/remove-message-rework branch November 8, 2025 14:52
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.

4 participants

Comments