Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: Send player reason when teleport fails

This commit is contained in:
Ben Woo 2023-04-13 23:03:21 +08:00
parent ef14a398c3
commit 6e72e72fb0
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
3 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
View File

@ -11,6 +11,7 @@ import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.commandtools.MVCommandManager;
import com.onarandombox.MultiverseCore.commandtools.MultiverseCommand;
import com.onarandombox.MultiverseCore.destination.DestinationsProvider;
@ -49,16 +50,18 @@ public class TeleportCommand extends MultiverseCommand {
) {
// TODO Add warning if teleporting too many players at once.
String playerName = players.length == 1
? issuer.getPlayer() == players[0] ? "you" : players[0].getName()
: players.length + " players";
issuer.sendInfo(MVCorei18n.TELEPORT_SUCCESS,
"{player}", playerName, "{destination}", destination.toString());
CompletableFuture.allOf(Arrays.stream(players)
.map(player -> this.destinationsProvider.playerTeleportAsync(issuer, player, destination))
.toArray(CompletableFuture[]::new))
.thenRun(() -> {
String playerName = players.length == 1
? issuer.getPlayer() == players[0] ? "you" : players[0].getName()
: players.length + " players";
issuer.sendInfo(MVCorei18n.TELEPORT_SUCCESS,
"{player}", playerName, "{destination}", destination.toString());
Logging.finer("Async teleport completed.");
});
}

36
src/main/java/com/onarandombox/MultiverseCore/listeners/NewMVPlayerListener.java
View File

@ -12,7 +12,10 @@ import com.onarandombox.MultiverseCore.inject.InjectableListener;
import com.onarandombox.MultiverseCore.teleportation.TeleportQueue;
import com.onarandombox.MultiverseCore.utils.permissions.PermissionsChecker;
import com.onarandombox.MultiverseCore.utils.result.ResultGroup;
import com.onarandombox.MultiverseCore.world.entrycheck.BlacklistResult;
import com.onarandombox.MultiverseCore.world.entrycheck.EntryFeeResult;
import com.onarandombox.MultiverseCore.world.entrycheck.PlayerLimitResult;
import com.onarandombox.MultiverseCore.world.entrycheck.WorldAccessResult;
import com.onarandombox.MultiverseCore.world.entrycheck.WorldEntryCheckerProvider;
import io.vavr.control.Option;
import jakarta.inject.Inject;
@ -184,11 +187,12 @@ public class NewMVPlayerListener implements InjectableListener {
.onFailure(() -> {
event.setCancelled(true);
Logging.fine("Player '%s' is not allowed to use portals to enter world '%s'.", player.getName(), toWorld.getName());
//TODO send player reason for failure
});
Logging.finer("Portal entry result for player '%s', from '%s' to '%s': %s",
player.getName(), fromWorld == null ? "null" : fromWorld.getName(), toWorld.getName(), worldEntryResult);
sendWorldEntryMessage(player, player, fromWorld, toWorld, worldEntryResult);
}
@EventHandler(priority = EventPriority.HIGHEST)
@ -238,11 +242,39 @@ public class NewMVPlayerListener implements InjectableListener {
.onFailure(() -> {
event.setCancelled(true);
Logging.fine("MV-Core is denying '%s' from going to '%s'.", teleportee.getName(), toWorld.getName());
//TODO send player reason for failure
});
Logging.fine("World entry result for player '%s', from '%s' to '%s': %s",
teleportee.getName(), fromWorld.map(MVWorld::getName).getOrNull(), toWorld.getName(), worldEntryResult);
sendWorldEntryMessage(teleporter, teleportee, fromWorld.getOrNull(), toWorld, worldEntryResult);
}
private void sendWorldEntryMessage(CommandSender teleporter, Player teleportee, MVWorld fromWorld, MVWorld toWorld, ResultGroup worldEntryResult) {
if (worldEntryResult.isSuccess()) {
return;
}
if (teleportee.equals(teleporter)) {
teleporter.sendMessage("You are unable to teleport to world '%s'".formatted(toWorld.getName()));
} else {
teleporter.sendMessage("You are unable to teleport '%s' to world '%s'".formatted(teleportee.getName(), toWorld.getName()));
}
worldEntryResult
.onFailureReason(WorldAccessResult.Failure.class, reason -> {
teleporter.sendMessage("You do not have permission to access world '%s'".formatted(toWorld.getName()));
})
.onFailureReason(PlayerLimitResult.Failure.class, reason -> {
teleporter.sendMessage("World '%s' is full".formatted(toWorld.getName()));
})
.onFailureReason(EntryFeeResult.Failure.class, reason -> {
teleporter.sendMessage("You do not have enough money to pay world '%s' entry fee.".formatted(toWorld.getName()));
//TODO Formatted entry fee amount
})
.onFailureReason(BlacklistResult.Failure.class, reason -> {
teleporter.sendMessage("World '%s' is blacklisted by world '%s'".formatted(fromWorld.getName(), toWorld.getName()));
});
}
@EventHandler(priority = EventPriority.MONITOR)

2
src/main/java/com/onarandombox/MultiverseCore/utils/result/ResultGroup.java
View File

@ -90,7 +90,7 @@ public class ResultGroup {
public String toString() {
return "ResultGroup{" +
"isSuccess=" + isSuccess +
", results=[" + results.stream().map(Objects::toString).collect(Collectors.joining(", ")) + "]" +
", results={" + results.stream().map(Objects::toString).collect(Collectors.joining(", ")) + "}" +
'}';
}