GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Remove LoginEvent usage in Floodgate-Spigot (#596)

Browse Source
This commit is contained in:
chris
2025-07-16 21:47:25 +02:00
committed by GitHub
parent 0e3163c942
commit b469c0c057
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build-logic/src/main/kotlin/Versions.kt
View File

@@ -33,8 +33,8 @@ object Versions {
const val guiceVersion = "6.0.0" const val guiceVersion = "6.0.0"
const val nettyVersion = "4.1.49.Final" const val nettyVersion = "4.1.49.Final"
const val snakeyamlVersion = "1.28" const val snakeyamlVersion = "1.28"
const val cloudVersion = "2.0.0-SNAPSHOT" // for cloud-minecraft const val cloudVersion = "2.0.0-beta.11" // for cloud-minecraft
const val cloudCore = "2.0.0-rc.1" const val cloudCore = "2.0.0-rc.2"
const val bstatsVersion = "3.0.2" const val bstatsVersion = "3.0.2"
const val javaWebsocketVersion = "1.5.2" const val javaWebsocketVersion = "1.5.2"

4
spigot/build.gradle.kts
View File

@@ -13,9 +13,7 @@ indra {
dependencies { dependencies {
api(projects.core) api(projects.core)
//implementation("org.incendo", "cloud-paper", Versions.cloudVersion) implementation("org.incendo", "cloud-paper", Versions.cloudVersion)
// TODO change back after https://github.com/incendo/cloud-minecraft is merged
implementation("com.github.onebeastchris.cloud-minecraft", "cloud-paper", "jitpack-SNAPSHOT")
// hack to make pre 1.12 work // hack to make pre 1.12 work
implementation("com.google.guava", "guava", guavaVersion) implementation("com.google.guava", "guava", guavaVersion)

7
spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java
View File

@@ -30,7 +30,7 @@ import java.util.UUID;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.geysermc.floodgate.api.SimpleFloodgateApi; import org.geysermc.floodgate.api.SimpleFloodgateApi;
import org.geysermc.floodgate.api.logger.FloodgateLogger; import org.geysermc.floodgate.api.logger.FloodgateLogger;
@@ -43,11 +43,8 @@ public final class SpigotListener implements Listener {
@Inject private FloodgateLogger logger; @Inject private FloodgateLogger logger;
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerLogin(PlayerLoginEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
UUID uniqueId = event.getPlayer().getUniqueId(); UUID uniqueId = event.getPlayer().getUniqueId();
if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
return;
}
// if there was another player with the same uuid online, // if there was another player with the same uuid online,
// he would've been disconnected by now // he would've been disconnected by now