diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt
index f22b3d80..5c14da23 100644
--- a/build-logic/src/main/kotlin/Versions.kt
+++ b/build-logic/src/main/kotlin/Versions.kt
@@ -33,8 +33,8 @@ object Versions {
     const val guiceVersion = "6.0.0"
     const val nettyVersion = "4.1.49.Final"
     const val snakeyamlVersion = "1.28"
-    const val cloudVersion = "2.0.0-SNAPSHOT" // for cloud-minecraft
-    const val cloudCore = "2.0.0-rc.1"
+    const val cloudVersion = "2.0.0-beta.11" // for cloud-minecraft
+    const val cloudCore = "2.0.0-rc.2"
     const val bstatsVersion = "3.0.2"
 
     const val javaWebsocketVersion = "1.5.2"
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index af449d2f..6e95bae1 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -13,9 +13,7 @@ indra {
 dependencies {
     api(projects.core)
 
-    //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")
+    implementation("org.incendo", "cloud-paper", Versions.cloudVersion)
     // hack to make pre 1.12 work
     implementation("com.google.guava", "guava", guavaVersion)
 
diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java
index 3574af44..8c19dd74 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/listener/SpigotListener.java
@@ -30,7 +30,7 @@ import java.util.UUID;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 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.geysermc.floodgate.api.SimpleFloodgateApi;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
@@ -43,11 +43,8 @@ public final class SpigotListener implements Listener {
     @Inject private FloodgateLogger logger;
 
     @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerLogin(PlayerLoginEvent event) {
+    public void onPlayerJoin(PlayerJoinEvent event) {
         UUID uniqueId = event.getPlayer().getUniqueId();
-        if (event.getResult() != PlayerLoginEvent.Result.ALLOWED) {
-            return;
-        }
 
         // if there was another player with the same uuid online,
         // he would've been disconnected by now