Skip to content

feat: send broadcasts when players use spectator menu #48

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.

Sign up for GitHub

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

Draft
iLynxcat wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: send broadcasts when players use spectator menu #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0c5c6e
broadcast when targeting players via spectator menu
iLynxcat Dec 23, 2025
3809de2
doc: PlayerTeleportEvent does not not fire on Folia
iLynxcat Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions src/main/java/org/modernbeta/admintoolbox/managers/admin/AdminManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.modernbeta.admintoolbox.managers.admin;

import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import org.bukkit.Bukkit;
Expand All @@ -24,6 +25,7 @@
import org.bukkit.inventory.ItemStack;
import org.modernbeta.admintoolbox.AdminToolboxPlugin;
import org.modernbeta.admintoolbox.managers.admin.AdminState.TeleportHistory;
import org.modernbeta.admintoolbox.utils.LocationUtils;

import javax.annotation.Nullable;
import java.util.Map;
Expand Down Expand Up @@ -275,15 +277,44 @@ void onAdminJoin(PlayerJoinEvent joinEvent) {
/**
* Prevent players in admin mode from using the spectator teleport menu unless they have
* permission to teleport to players directly.
*
* <p>
* <strong>PlayerTeleportEvent does not fire on Folia servers.</strong>
* See <a href="https://github.com/PaperMC/Folia/issues/105#issuecomment-1610418720">PaperMC/Folia#105</a>
*/
@EventHandler
void onAdminTeleport(PlayerTeleportEvent teleportEvent) {
Player player = teleportEvent.getPlayer();
if (!isActiveAdmin(player)) return;
if (teleportEvent.getCause() != PlayerTeleportEvent.TeleportCause.SPECTATE) return;
if (player.hasPermission(TARGET_PLAYER_PERMISSION))
// allow if admin can spectate players directly, allow it
if (player.hasPermission(TARGET_PLAYER_PERMISSION)) {
// allow if admin can spectate players directly, broadcast and allow it
Location dest = teleportEvent.getTo();

Bukkit.getRegionScheduler().run(plugin, dest, (task) -> {
dest.getNearbyPlayers(0.5).stream()
.filter((nearbyPlayer) -> !nearbyPlayer.getUniqueId().equals(player.getUniqueId()))
.findFirst()
.ifPresentOrElse((target) -> {
plugin.getAdminAudience().sendMessage(Component.text()
.color(NamedTextColor.GOLD)
.append(Component.text(player.getName()))
.append(Component.text(" is spectating at "))
.append(Component.text(target.getName()))
.build());
}, () -> {
plugin.getAdminAudience().sendMessage(Component.text()
.color(NamedTextColor.GOLD)
.append(Component.text(player.getName()))
.append(Component.text(" is spectating at "))
.append(Component.text(
LocationUtils.prettifyCoordinates(teleportEvent.getTo()))
)
.build());
});
});
return;
}

player.sendRichMessage("<red>You don't have permission to spectate players");
teleportEvent.setCancelled(true);
Expand Down