Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-28 12:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle PlayerLoginEvent not being called in offline mode in required linking

Browse Source
This commit is contained in:
Vankka 2024-07-07 12:44:56 +03:00
parent a3f7b448ac
commit d6ece0abe7
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
1 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
bukkit/src/main/java/com/discordsrv/bukkit/requiredlinking/BukkitRequiredLinkingModule.java
View File

@ -33,9 +33,11 @@ import org.bukkit.entity.Player;
import org.bukkit.event.*; import org.bukkit.event.*;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -180,6 +182,7 @@ public class BukkitRequiredLinkingModule extends ServerRequireLinkingModule<Bukk
// //
private final Map<UUID, Component> frozen = new ConcurrentHashMap<>(); private final Map<UUID, Component> frozen = new ConcurrentHashMap<>();
private final List<UUID> loginsHandled = new CopyOnWriteArrayList<>();
private boolean isFrozen(Player player) { private boolean isFrozen(Player player) {
return frozen.containsKey(player.getUniqueId()); return frozen.containsKey(player.getUniqueId());
@ -191,11 +194,50 @@ public class BukkitRequiredLinkingModule extends ServerRequireLinkingModule<Bukk
} }
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onPreLogin(AsyncPlayerPreLoginEvent event) { public void onAsyncPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) { if (event.getLoginResult() != AsyncPlayerPreLoginEvent.Result.ALLOWED) {
return; return;
} }
UUID playerUUID = event.getUniqueId();
loginsHandled.add(playerUUID);
handleLogin(playerUUID, event.getName());
}
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerLogin(PlayerLoginEvent event) {
if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
frozen.remove(event.getPlayer().getUniqueId());
}
}
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerJoinLowest(PlayerJoinEvent event) {
Player player = event.getPlayer();
UUID playerUUID = player.getUniqueId();
if (!loginsHandled.remove(playerUUID)) {
handleLogin(playerUUID, player.getName());
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoinMonitor(PlayerJoinEvent event) {
UUID playerUUID = event.getPlayer().getUniqueId();
Component blockReason = frozen.get(playerUUID);
if (blockReason == null) {
return;
}
IPlayer srvPlayer = discordSRV.playerProvider().player(playerUUID);
if (srvPlayer == null) {
throw new IllegalStateException("Player not available: " + playerUUID);
}
srvPlayer.sendMessage(blockReason);
}
private void handleLogin(UUID playerUUID, String username) {
if (discordSRV.isShutdown()) { if (discordSRV.isShutdown()) {
return; return;
} else if (!discordSRV.isReady()) { } else if (!discordSRV.isReady()) {
@ -211,35 +253,12 @@ public class BukkitRequiredLinkingModule extends ServerRequireLinkingModule<Bukk
return; return;
} }
Component blockReason = getBlockReason(event.getUniqueId(), event.getName(), false).join(); Component blockReason = getBlockReason(playerUUID, username, false).join();
if (blockReason != null) { if (blockReason != null) {
frozen.put(event.getUniqueId(), blockReason); frozen.put(playerUUID, blockReason);
} }
} }
@EventHandler(priority = EventPriority.MONITOR)
public void onLogin(PlayerLoginEvent event) {
if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
frozen.remove(event.getPlayer().getUniqueId());
}
}
@EventHandler(priority = EventPriority.MONITOR)
public void onJoin(PlayerJoinEvent event) {
UUID uuid = event.getPlayer().getUniqueId();
Component blockReason = frozen.get(uuid);
if (blockReason == null) {
return;
}
IPlayer player = discordSRV.playerProvider().player(uuid);
if (player == null) {
throw new IllegalStateException("Player not available: " + uuid);
}
player.sendMessage(blockReason);
}
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
Component freezeReason = frozen.get(event.getPlayer().getUniqueId()); Component freezeReason = frozen.get(event.getPlayer().getUniqueId());
@ -271,7 +290,7 @@ public class BukkitRequiredLinkingModule extends ServerRequireLinkingModule<Bukk
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onPlayerChat(AsyncPlayerChatEvent event) { public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
Component freezeReason = frozen.get(event.getPlayer().getUniqueId()); Component freezeReason = frozen.get(event.getPlayer().getUniqueId());
if (freezeReason == null) { if (freezeReason == null) {
event.getRecipients().removeIf(this::isFrozen); event.getRecipients().removeIf(this::isFrozen);
@ -285,7 +304,7 @@ public class BukkitRequiredLinkingModule extends ServerRequireLinkingModule<Bukk
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onPlayerCommand(PlayerCommandPreprocessEvent event) { public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
if (!isFrozen(event.getPlayer())) { if (!isFrozen(event.getPlayer())) {
return; return;
} }