fix: kick player from plot if denied on join

Signed-off-by: Florian Reuth <git@florianreuth.de>

Author: florianreuth

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -29,6 +29,7 @@
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.Caption;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.listener.PlayerBlockEventType;
 import com.plotsquared.core.listener.PlotListener;
 import com.plotsquared.core.location.Location;
@@ -543,7 +544,7 @@ public void onConnect(PlayerJoinEvent event) {
         if (area != null) {
             Plot plot = area.getPlot(location);
             if (plot != null) {
-                plotListener.plotEntry(pp, plot);
+                this.enforceJoinEntry(pp, player, plot);
             }
         }
         // Delayed
@@ -575,6 +576,24 @@ public void onConnect(PlayerJoinEvent event) {
         }
     }
 
+    private void enforceJoinEntry(final PlotPlayer<Player> player, final Player bukkitPlayer, final Plot plot) {
+        if (!this.plotListener.plotEntry(player, plot)) {
+            Location spawn = PlotSquared.platform().worldUtil().getSpawn(plot.getWorldName());
+            if (!plot.equals(spawn.getPlot())) {
+                player.teleport(spawn, TeleportCause.DENIED);
+                return;
+            }
+
+            Location fallbackSpawn = PlotSquared.platform().worldUtil().getSpawn(this.plotAreaManager.getAllWorlds()[0]);
+            if (plot.equals(fallbackSpawn.getPlot())) {
+                player.kick(
+                        "You got kicked from the plot! This server did not set up a loaded spawn, so you got kicked from the server.");
+            } else {
+                player.teleport(fallbackSpawn, TeleportCause.DENIED);
+            }
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void playerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
@@ -754,8 +773,10 @@ public void playerMove(PlayerMoveEvent event) {
             if (now == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, now, area) && this.tmpTeleport && !kickAccess.get().orElse(
-                            false)) {
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, now, area) && this.tmpTeleport && !kickAccess
+                            .get()
+                            .orElse(
+                                    false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
                                 TagResolver.resolver(
@@ -848,8 +869,10 @@ public void playerMove(PlayerMoveEvent event) {
             if (plot == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, null, area) && this.tmpTeleport && !kickAccess.get().orElse(
-                            false)) {
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, null, area) && this.tmpTeleport && !kickAccess
+                            .get()
+                            .orElse(
+                                    false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
                                 TagResolver.resolver(