spawn event

src/main/java/me.angeschossen.lands.api/events/ChunkDeleteEvent.java

@@ -1,7 +1,7 @@
 package me.angeschossen.lands.api.events;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.events.land.DeleteReason;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
@@ -10,7 +10,7 @@
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class ChunkDeleteEvent extends LandEditEvent implements Cancellable {
+public class ChunkDeleteEvent extends LandEvent implements Cancellable {
     public static HandlerList handlerList = new HandlerList();
     private final int x, z;
     private final World world;

src/main/java/me.angeschossen.lands.api/events/ChunkPostClaimEvent.java

@@ -1,13 +1,13 @@
 package me.angeschossen.lands.api.events;
 
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.land.LandWorld;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class ChunkPostClaimEvent extends LandEditEvent {
+public class ChunkPostClaimEvent extends LandEvent {
 
     public static HandlerList handlerList = new HandlerList();
 

src/main/java/me.angeschossen.lands.api/events/ChunkPreClaimEvent.java

@@ -1,14 +1,14 @@
 package me.angeschossen.lands.api.events;
 
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.land.LandWorld;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class ChunkPreClaimEvent extends LandEditEvent implements Cancellable {
+public class ChunkPreClaimEvent extends LandEvent implements Cancellable {
 
     public static HandlerList handlerList = new HandlerList();
     private final int x;

src/main/java/me.angeschossen.lands.api/events/LandCreateEvent.java

@@ -1,13 +1,13 @@
 package me.angeschossen.lands.api.events;
 
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class LandCreateEvent extends LandEditEvent implements Cancellable {
+public class LandCreateEvent extends LandEvent implements Cancellable {
 
     public static HandlerList handlerList = new HandlerList();
     private boolean cancelled;

src/main/java/me.angeschossen.lands.api/events/LandDeleteEvent.java

@@ -1,15 +1,15 @@
 package me.angeschossen.lands.api.events;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.events.land.DeleteReason;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class LandDeleteEvent extends LandEditEvent implements Cancellable {
+public class LandDeleteEvent extends LandEvent implements Cancellable {
 
     public static HandlerList handlerList = new HandlerList();
     private final DeleteReason reason;

src/main/java/me.angeschossen.lands.api/events/LandRenameEvent.java

@@ -1,14 +1,14 @@
 package me.angeschossen.lands.api.events;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class LandRenameEvent extends LandEditEvent implements Cancellable {
+public class LandRenameEvent extends LandEvent implements Cancellable {
     public static final HandlerList handlerList = new HandlerList();
     private final String oldName;
     private final String newName;

src/main/java/me.angeschossen.lands.api/events/internal/LandEditCancelableEvent.java → src/main/java/me.angeschossen.lands.api/events/internal/LandCancelableEvent.java

@@ -7,7 +7,7 @@
 
 import java.util.UUID;
 
-public abstract class LandEditCancelableEvent extends LandEditEvent implements Cancellable {
+public abstract class LandCancelableEvent extends LandEvent implements Cancellable {
 
     private boolean cancelled;
 
@@ -21,11 +21,11 @@ public void setCancelled(boolean cancel) {
         this.cancelled = cancel;
     }
 
-    public LandEditCancelableEvent(@NotNull Land land, LandPlayer landPlayer) {
+    public LandCancelableEvent(@NotNull Land land, LandPlayer landPlayer) {
         super(land, landPlayer);
     }
 
-    public LandEditCancelableEvent(@NotNull Land land, UUID landPlayer) {
+    public LandCancelableEvent(@NotNull Land land, UUID landPlayer) {
         super(land, landPlayer);
     }
 }

src/main/java/me.angeschossen.lands.api/events/internal/LandEditEvent.java → src/main/java/me.angeschossen.lands.api/events/internal/LandEvent.java

@@ -9,17 +9,17 @@
 import java.util.Collection;
 import java.util.UUID;
 
-public abstract class LandEditEvent extends LandsPlayerNullableEvent {
+public abstract class LandEvent extends LandsPlayerNullableEvent {
 
     protected final @NotNull Land land;
 
-    public LandEditEvent(@NotNull Land land, LandPlayer landPlayer) {
+    public LandEvent(@NotNull Land land, LandPlayer landPlayer) {
         super(landPlayer);
 
         this.land = land;
     }
 
-    public LandEditEvent(@NotNull Land land, UUID landPlayer) {
+    public LandEvent(@NotNull Land land, UUID landPlayer) {
         super(landPlayer);
 
         this.land = land;

src/main/java/me.angeschossen.lands.api/events/internal/NationMemberEditEvent.java

@@ -9,7 +9,7 @@
 import java.util.Collection;
 import java.util.UUID;
 
-public abstract class NationMemberEditEvent extends LandEditEvent {
+public abstract class NationMemberEditEvent extends LandEvent {
     protected final UUID initiator;
     protected final Nation nation;
     protected final Land land;

src/main/java/me.angeschossen.lands.api/events/land/LandConvertEvent.java

@@ -1,7 +1,7 @@
 package me.angeschossen.lands.api.events.land;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.land.enums.LandType;
 import me.angeschossen.lands.api.player.LandPlayer;
@@ -10,7 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class LandConvertEvent extends LandEditEvent implements Cancellable {
+public class LandConvertEvent extends LandEvent implements Cancellable {
     public static HandlerList handlerList = new HandlerList();
     private final @NotNull LandType landType;
     private boolean cancelled;

src/main/java/me.angeschossen.lands.api/events/land/bank/BankEvent.java

@@ -1,14 +1,14 @@
 package me.angeschossen.lands.api.events.land.bank;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class BankEvent extends LandEditEvent implements Cancellable {
+public abstract class BankEvent extends LandEvent implements Cancellable {
     private boolean cancelled = false;
     private final double value;
 

src/main/java/me.angeschossen.lands.api/events/land/bank/LandBankBalanceChangedEvent.java

@@ -1,13 +1,13 @@
 package me.angeschossen.lands.api.events.land.bank;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 
-public class LandBankBalanceChangedEvent extends LandEditEvent {
+public class LandBankBalanceChangedEvent extends LandEvent {
 
     public static final HandlerList handlerList = new HandlerList();
     private final double prev, now;

src/main/java/me.angeschossen.lands.api/events/land/bank/LandBankDepositEvent.java

@@ -1,10 +1,6 @@
 package me.angeschossen.lands.api.events.land.bank;
 
-import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
-import me.angeschossen.lands.api.events.memberholder.MemberHolderEvent;
 import me.angeschossen.lands.api.land.Land;
-import me.angeschossen.lands.api.memberholder.MemberHolder;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;

src/main/java/me.angeschossen.lands.api/events/land/claiming/LandUnclaimAllEvent.java

@@ -1,14 +1,14 @@
 package me.angeschossen.lands.api.events.land.claiming;
 
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class LandUnclaimAllEvent extends LandEditEvent implements Cancellable {
+public class LandUnclaimAllEvent extends LandEvent implements Cancellable {
     public static HandlerList handlerList = new HandlerList();
     private boolean cancelled;
 

src/main/java/me.angeschossen.lands.api/events/land/claiming/LandUnclaimSelectionEvent.java

@@ -1,6 +1,6 @@
 package me.angeschossen.lands.api.events.land.claiming;
 
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.ChunkCoordinate;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
@@ -12,7 +12,7 @@
 
 import java.util.Set;
 
-public class LandUnclaimSelectionEvent extends LandEditEvent implements Cancellable {
+public class LandUnclaimSelectionEvent extends LandEvent implements Cancellable {
     public static HandlerList handlerList = new HandlerList();
     private final Selection selection;
     private boolean cancelled;

src/main/java/me.angeschossen.lands.api/events/land/spawn/LandSpawnRemoveEvent.java

@@ -1,22 +1,20 @@
 package me.angeschossen.lands.api.events.land.spawn;
 
-import me.angeschossen.lands.api.events.internal.LandEditEvent;
+import me.angeschossen.lands.api.events.internal.LandEvent;
 import me.angeschossen.lands.api.land.Land;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.Location;
 import org.bukkit.event.HandlerList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 /**
  * This event is called each time the spawn is removed.
  * It mostly fires when an admin deletes world data or the world, in which the spawn was located
  * in doesn't exist any longer. This is not called upon land deletion.
  * If you want to handle this case too, just listen to {@link me.angeschossen.lands.api.events.LandDeleteEvent}.
  */
-public class LandSpawnRemoveEvent extends LandEditEvent {
+public class LandSpawnRemoveEvent extends LandEvent {
     public static HandlerList handlerList = new HandlerList();
     private final Location current;
 

src/main/java/me.angeschossen.lands.api/events/land/spawn/LandSpawnSetEvent.java

@@ -1,9 +1,8 @@
 package me.angeschossen.lands.api.events.land.spawn;
 
 import com.google.common.collect.ImmutableMap;
-import me.angeschossen.lands.api.events.internal.LandEditCancelableEvent;
+import me.angeschossen.lands.api.events.internal.LandCancelableEvent;
 import me.angeschossen.lands.api.land.Land;
-import me.angeschossen.lands.api.land.enums.LandType;
 import me.angeschossen.lands.api.player.LandPlayer;
 import org.bukkit.Location;
 import org.bukkit.event.HandlerList;
@@ -15,7 +14,7 @@
 /**
  * This even is called each time the spawn if a land changes.
  */
-public class LandSpawnSetEvent extends LandEditCancelableEvent {
+public class LandSpawnSetEvent extends LandCancelableEvent {
     public static HandlerList handlerList = new HandlerList();
     private final @NotNull Location location;
 

src/main/java/me.angeschossen.lands.api/events/land/spawn/LandSpawnTeleportEvent.java

@@ -0,0 +1,46 @@
+package me.angeschossen.lands.api.events.land.spawn;
+
+import me.angeschossen.lands.api.events.internal.LandEvent;
+import me.angeschossen.lands.api.land.Land;
+import me.angeschossen.lands.api.player.LandPlayer;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+public class LandSpawnTeleportEvent extends LandEvent implements Cancellable {
+    public static HandlerList handlerList = new HandlerList();
+    private boolean cancelled;
+
+    public LandSpawnTeleportEvent(@NotNull Land land, @NotNull LandPlayer landPlayer) {
+        super(land, landPlayer);
+
+        Objects.requireNonNull(landPlayer, "LandPlayer can't be null");
+    }
+
+    @Override
+    public @NotNull LandPlayer getLandPlayer() {
+        assert super.getLandPlayer() != null;
+        return super.getLandPlayer();
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlerList;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlerList;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancel) {
+        this.cancelled = cancel;
+    }
+}

src/main/java/me.angeschossen.lands.api/events/player/PlayerSpawnLandEvent.java

@@ -11,6 +11,10 @@
 import java.util.Collection;
 import java.util.UUID;
 
+/**
+ * Deprecated. Use {@link me.angeschossen.lands.api.events.land.spawn.LandSpawnTeleportEvent} instead.
+ */
+@Deprecated
 public class PlayerSpawnLandEvent extends LandsPlayerEvent implements Cancellable {
     public static final HandlerList handlerList = new HandlerList();
     private final @NotNull Land land;