EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-08-23 06:15:35 +02:00
Code Issues Projects Releases Wiki Activity

fix: fix a specific situation where a merge can fail but take money still

Browse Source
This commit is contained in:
dordsor21
2025-08-22 16:03:49 +01:00
parent cd6a32cf44
commit 49767b568a
1 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
Core/src/main/java/com/plotsquared/core/command/Merge.java
View File

@@ -40,6 +40,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.UUID; import java.util.UUID;
import java.util.function.Supplier;
@CommandDeclaration(command = "merge", @CommandDeclaration(command = "merge",
aliases = "m", aliases = "m",
@@ -116,9 +117,11 @@ public class Merge extends SubCommand {
if (direction == null) { if (direction == null) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("commandconfig.command_syntax"), TranslatableCaption.of("commandconfig.command_syntax"),
TagResolver.resolver("value", Tag.inserting(Component.text( TagResolver.resolver(
"/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]" "value", Tag.inserting(Component.text(
))) "/plot merge <" + StringMan.join(values, " | ") + "> [removeroads]"
))
)
); );
player.sendMessage( player.sendMessage(
TranslatableCaption.of("help.direction"), TranslatableCaption.of("help.direction"),
@@ -244,54 +247,66 @@ public class Merge extends SubCommand {
} }
java.util.Set<UUID> uuids = adjacent.getOwners(); java.util.Set<UUID> uuids = adjacent.getOwners();
boolean isOnline = false; boolean isOnline = false;
for (final UUID owner : uuids) { if (!force) {
final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner); for (final UUID owner : uuids) {
if (!force && accepter == null) { final PlotPlayer<?> accepter = PlotSquared.platform().playerManager().getPlayerIfExists(owner);
continue; if (accepter == null) {
} continue;
isOnline = true;
final Direction dir = direction;
Runnable run = () -> {
accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain);
PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
if (plotPlayer == null) {
accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
return;
} }
if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) { isOnline = true;
if (!force && this.econHandler.getMoney(player) < price) { final Direction dir = direction;
player.sendMessage( Supplier<Boolean> run = () -> {
TranslatableCaption.of("economy.cannot_afford_merge"), accepter.sendMessage(TranslatableCaption.of("merge.merge_accepted"));
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price)))) if (plot.getPlotModificationManager().autoMerge(dir, maxSize - size, owner, player, terrain)) {
); PlotPlayer<?> plotPlayer = PlotSquared.platform().playerManager().getPlayerIfExists(player.getUUID());
return; if (plotPlayer == null) {
accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
return false;
}
if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
if (this.econHandler.getMoney(player) < price) {
player.sendMessage(
TranslatableCaption.of("economy.cannot_afford_merge"),
TagResolver.resolver(
"money",
Tag.inserting(Component.text(this.econHandler.format(price)))
)
);
return false;
}
this.econHandler.withdrawMoney(player, price);
player.sendMessage(
TranslatableCaption.of("economy.removed_balance"),
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
);
}
player.sendMessage(TranslatableCaption.of("merge.success_merge"));
eventDispatcher.callPostMerge(player, plot);
return true;
} }
this.econHandler.withdrawMoney(player, price); player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
player.sendMessage( return false;
TranslatableCaption.of("economy.removed_balance"), };
TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price)))) if (hasConfirmation(player)) {
CmdConfirm.addPending(
accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
.deserialize(
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
TagResolver.builder()
.tag("player", Tag.inserting(Component.text(player.getName())))
.tag(
"location",
Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
)
.build()
)),
run::get
); );
} else {
return run.get();
} }
player.sendMessage(TranslatableCaption.of("merge.success_merge")); // find first
eventDispatcher.callPostMerge(player, plot); break;
};
if (!force && hasConfirmation(player)) {
CmdConfirm.addPending(accepter, MINI_MESSAGE.serialize(MINI_MESSAGE
.deserialize(
TranslatableCaption.of("merge.merge_request_confirm").getComponent(player),
TagResolver.builder()
.tag("player", Tag.inserting(Component.text(player.getName())))
.tag(
"location",
Tag.inserting(Component.text(plot.getWorldName() + " " + plot.getId()))
)
.build()
)),
run
);
} else {
run.run();
} }
} }
if (force || !isOnline) { if (force || !isOnline) {