pala M-tpa: /tpa /tpaccept /tpdeny (delai 3s + invisibilite 15s, wiki commandes)
This commit is contained in:
@@ -34,6 +34,16 @@ public final class PalaCommands {
|
||||
|
||||
// M-cmd-util : /spawn differe (delai wiki 3 s = 60 ticks). UUID -> tick d'execution.
|
||||
private static final java.util.Map<java.util.UUID, Long> SPAWN_QUEUE = new java.util.HashMap<>();
|
||||
// M-tpa (wiki commandes) : demandes /tpa en attente. Cible -> (demandeur, tick d'expiration).
|
||||
private static final java.util.Map<java.util.UUID, TpaRequest> TPA_REQUESTS = new java.util.HashMap<>();
|
||||
// TP differees vers un joueur (acceptees) : teleporte -> (cible, tick d'execution).
|
||||
private static final java.util.Map<java.util.UUID, TpaTask> TPA_QUEUE = new java.util.HashMap<>();
|
||||
|
||||
private record TpaRequest(java.util.UUID from, long expireTick) {
|
||||
}
|
||||
|
||||
private record TpaTask(java.util.UUID target, long at) {
|
||||
}
|
||||
|
||||
private PalaCommands() {
|
||||
}
|
||||
@@ -78,8 +88,18 @@ public final class PalaCommands {
|
||||
.executes(command -> craft(command.getSource())));
|
||||
dispatcher.register(Commands.literal("spawn")
|
||||
.executes(command -> spawn(command.getSource())));
|
||||
dispatcher.register(Commands.literal("tpa")
|
||||
.then(Commands.argument("cible", EntityArgument.player())
|
||||
.executes(command -> tpa(command.getSource(),
|
||||
EntityArgument.getPlayer(command, "cible")))));
|
||||
dispatcher.register(Commands.literal("tpaccept")
|
||||
.executes(command -> tpRespond(command.getSource(), true)));
|
||||
dispatcher.register(Commands.literal("tpdeny")
|
||||
.executes(command -> tpRespond(command.getSource(), false)));
|
||||
net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents.END_SERVER_TICK
|
||||
.register(PalaCommands::tickSpawnQueue);
|
||||
net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents.END_SERVER_TICK
|
||||
.register(PalaCommands::tickTpaQueue);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -280,4 +300,90 @@ public final class PalaCommands {
|
||||
teleportPlayer(player, overworld, overworld.getRespawnData().pos());
|
||||
}
|
||||
}
|
||||
|
||||
// /tpa <cible> : demande de tp (expire apres 60 s). /tpaccept : tp dans 3 s (wiki) +
|
||||
// invisibilite 15 s du teleporte (wiki). /tpdeny : refus.
|
||||
private static int tpa(CommandSourceStack source, ServerPlayer cible) {
|
||||
try {
|
||||
ServerPlayer player = source.getPlayerOrException();
|
||||
if (player.getUUID().equals(cible.getUUID())) {
|
||||
source.sendFailure(Component.literal("§cDemande vers soi-meme impossible."));
|
||||
return 0;
|
||||
}
|
||||
MinecraftServer server = source.getServer();
|
||||
TPA_REQUESTS.put(cible.getUUID(),
|
||||
new TpaRequest(player.getUUID(), (long) server.getTickCount() + 1200L));
|
||||
player.sendSystemMessage(Component.literal(
|
||||
"§6[Pala] §7Demande envoyee a " + cible.getScoreboardName() + "."));
|
||||
cible.sendSystemMessage(Component.literal("§6[Pala] §7" + player.getScoreboardName()
|
||||
+ " veut se teleporter a vous : §a/tpaccept §7ou §c/tpdeny §7(60 s)."));
|
||||
return Command.SINGLE_SUCCESS;
|
||||
} catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private static int tpRespond(CommandSourceStack source, boolean accept) {
|
||||
try {
|
||||
ServerPlayer player = source.getPlayerOrException();
|
||||
MinecraftServer server = source.getServer();
|
||||
TpaRequest request = TPA_REQUESTS.remove(player.getUUID());
|
||||
if (request == null || server.getTickCount() > request.expireTick()) {
|
||||
source.sendFailure(Component.literal("§cAucune demande en attente."));
|
||||
return 0;
|
||||
}
|
||||
ServerPlayer demandeur = server.getPlayerList().getPlayer(request.from());
|
||||
if (demandeur == null) {
|
||||
source.sendFailure(Component.literal("§cDemandeur deconnecte."));
|
||||
return 0;
|
||||
}
|
||||
if (!accept) {
|
||||
demandeur.sendSystemMessage(Component.literal("§6[Pala] §7"
|
||||
+ player.getScoreboardName() + " a refuse votre demande."));
|
||||
player.sendSystemMessage(Component.literal("§6[Pala] §7Demande refusee."));
|
||||
return Command.SINGLE_SUCCESS;
|
||||
}
|
||||
TPA_QUEUE.put(demandeur.getUUID(),
|
||||
new TpaTask(player.getUUID(), (long) server.getTickCount() + 60L));
|
||||
demandeur.sendSystemMessage(Component.literal(
|
||||
"§6[Pala] §7Demande acceptee, teleportation dans 3 secondes..."));
|
||||
player.sendSystemMessage(Component.literal("§6[Pala] §7Demande acceptee."));
|
||||
return Command.SINGLE_SUCCESS;
|
||||
} catch (com.mojang.brigadier.exceptions.CommandSyntaxException e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private static void tickTpaQueue(MinecraftServer server) {
|
||||
if (TPA_QUEUE.isEmpty()) {
|
||||
if (!TPA_REQUESTS.isEmpty()) {
|
||||
int now = server.getTickCount();
|
||||
TPA_REQUESTS.entrySet().removeIf(entry -> now > entry.getValue().expireTick());
|
||||
}
|
||||
return;
|
||||
}
|
||||
int now = server.getTickCount();
|
||||
java.util.Iterator<java.util.Map.Entry<java.util.UUID, TpaTask>> it =
|
||||
TPA_QUEUE.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
java.util.Map.Entry<java.util.UUID, TpaTask> entry = it.next();
|
||||
if (now < entry.getValue().at()) {
|
||||
continue;
|
||||
}
|
||||
it.remove();
|
||||
ServerPlayer player = server.getPlayerList().getPlayer(entry.getKey());
|
||||
ServerPlayer cible = server.getPlayerList().getPlayer(entry.getValue().target());
|
||||
if (player == null || cible == null) {
|
||||
continue;
|
||||
}
|
||||
ServerLevel level = cible.level();
|
||||
BlockPos pos = cible.blockPosition();
|
||||
player.teleport(new TeleportTransition(level, new Vec3(pos.getX() + 0.5, pos.getY() + 1.0,
|
||||
pos.getZ() + 0.5), Vec3.ZERO, cible.getYRot(), cible.getXRot(),
|
||||
TeleportTransition.DO_NOTHING));
|
||||
player.addEffect(new net.minecraft.world.effect.MobEffectInstance(
|
||||
net.minecraft.world.effect.MobEffects.INVISIBILITY, 300, 0, false, false));
|
||||
}
|
||||
TPA_REQUESTS.entrySet().removeIf(entry -> now > entry.getValue().expireTick());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user