Merge pull request #3288 from Multiverse/fix/bukkit-compatility

Fix PlayerSpawnLocationEvent may not be available on bukkit

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/listeners/MVPlayerListener.java

@@ -33,7 +33,9 @@
 import org.mvplugins.multiverse.core.command.MVCommandManager;
 import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.destination.DestinationsProvider;
+import org.mvplugins.multiverse.core.dynamiclistener.EventRunnable;
 import org.mvplugins.multiverse.core.dynamiclistener.annotations.DefaultEventPriority;
+import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventClass;
 import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventMethod;
 import org.mvplugins.multiverse.core.dynamiclistener.annotations.EventPriorityKey;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
@@ -195,59 +197,64 @@ private Option<Location> getMostAccurateRespawnLocation(LoadedMultiverseWorld mv
         return Option.of(mvWorld.getSpawnLocation());
     }
 
-    @EventMethod
+    @EventClass("org.spigotmc.event.player.PlayerSpawnLocationEvent")
     @EventPriorityKey("mvcore-player-spawn-location")
-    void playerSpawnLocation(PlayerSpawnLocationEvent event) {
-        Player player = event.getPlayer();
-        MultiverseWorld world = getWorldManager().getLoadedWorld(player.getWorld()).getOrNull();
-        if (world == null) {
-            Logging.finer("Player joined in a world that is not managed by Multiverse.");
-            return;
-        }
-        if (!player.hasPlayedBefore()) {
-            handleFirstSpawn(event);
-        } else {
-            handleJoinLocation(event);
-        }
-        this.handleGameModeAndFlight(player, event.getSpawnLocation().getWorld());
-    }
+    EventRunnable playerSpawnLocation() {
+        return new EventRunnable<PlayerSpawnLocationEvent>() {
+            @Override
+            public void onEvent(PlayerSpawnLocationEvent event) {
+                Player player = event.getPlayer();
+                MultiverseWorld world = getWorldManager().getLoadedWorld(player.getWorld()).getOrNull();
+                if (world == null) {
+                    Logging.finer("Player joined in a world that is not managed by Multiverse.");
+                    return;
+                }
+                if (!player.hasPlayedBefore()) {
+                    handleFirstSpawn(event);
+                } else {
+                    handleJoinLocation(event);
+                }
+                handleGameModeAndFlight(player, event.getSpawnLocation().getWorld());
+            }
 
-    private void handleFirstSpawn(PlayerSpawnLocationEvent event) {
-        if (!config.getFirstSpawnOverride()) {
-            Logging.finer("FirstSpawnOverride is disabled");
-            // User has disabled the feature in config
-            return;
-        }
-        Logging.fine("Moving NEW player to(firstspawnoverride): %s", config.getFirstSpawnLocation());
-        destinationsProvider.parseDestination(config.getFirstSpawnLocation())
-                .map(destination -> destination.getLocation(event.getPlayer())
-                        .peek(event::setSpawnLocation)
-                        .onEmpty(() -> Logging.warning("The destination in FirstSpawnLocation in config is invalid")))
-                .onFailure(failure -> {
-                    Logging.warning("Invalid destination in FirstSpawnLocation in config: %s");
-                    Logging.warning(failure.getFailureMessage().formatted(getLocales()));
-                });
-    }
+            private void handleFirstSpawn(PlayerSpawnLocationEvent event) {
+                if (!config.getFirstSpawnOverride()) {
+                    Logging.finer("FirstSpawnOverride is disabled");
+                    // User has disabled the feature in config
+                    return;
+                }
+                Logging.fine("Moving NEW player to(firstspawnoverride): %s", config.getFirstSpawnLocation());
+                destinationsProvider.parseDestination(config.getFirstSpawnLocation())
+                        .map(destination -> destination.getLocation(event.getPlayer())
+                                .peek(event::setSpawnLocation)
+                                .onEmpty(() -> Logging.warning("The destination in FirstSpawnLocation in config is invalid")))
+                        .onFailure(failure -> {
+                            Logging.warning("Invalid destination in FirstSpawnLocation in config: %s");
+                            Logging.warning(failure.getFailureMessage().formatted(getLocales()));
+                        });
+            }
 
-    private void handleJoinLocation(PlayerSpawnLocationEvent event) {
-        if (!config.getEnableJoinDestination()) {
-            Logging.finer("JoinDestination is disabled");
-            // User has disabled the feature in config
-            return;
-        }
-        if (config.getJoinDestination().isBlank()) {
-            Logging.warning("Joindestination is enabled but no destination has been specified in config!");
-            return;
-        }
-        Logging.finer("JoinDestination is " + config.getJoinDestination());
-        destinationsProvider.parseDestination(config.getJoinDestination())
-                .map(destination -> destination.getLocation(event.getPlayer())
-                    .peek(event::setSpawnLocation)
-                    .onEmpty(() -> Logging.warning("The destination in JoinDestination in config is invalid")))
-                .onFailure(failure -> {
-                    Logging.warning("Invalid destination in JoinDestination in config: %s");
-                    Logging.warning(failure.getFailureMessage().formatted(getLocales()));
-                });
+            private void handleJoinLocation(PlayerSpawnLocationEvent event) {
+                if (!config.getEnableJoinDestination()) {
+                    Logging.finer("JoinDestination is disabled");
+                    // User has disabled the feature in config
+                    return;
+                }
+                if (config.getJoinDestination().isBlank()) {
+                    Logging.warning("Joindestination is enabled but no destination has been specified in config!");
+                    return;
+                }
+                Logging.finer("JoinDestination is " + config.getJoinDestination());
+                destinationsProvider.parseDestination(config.getJoinDestination())
+                        .map(destination -> destination.getLocation(event.getPlayer())
+                                .peek(event::setSpawnLocation)
+                                .onEmpty(() -> Logging.warning("The destination in JoinDestination in config is invalid")))
+                        .onFailure(failure -> {
+                            Logging.warning("Invalid destination in JoinDestination in config: %s");
+                            Logging.warning(failure.getFailureMessage().formatted(getLocales()));
+                        });
+            }
+        };
     }
 
     /**