Add mount event support

Author: bensku

src/main/java/ch/njol/skript/events/SimpleEvents.java

@@ -80,6 +80,8 @@
 import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.event.world.WorldSaveEvent;
 import org.bukkit.event.world.WorldUnloadEvent;
+import org.spigotmc.event.entity.EntityDismountEvent;
+import org.spigotmc.event.entity.EntityMountEvent;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.util.SimpleEvent;
@@ -332,10 +334,16 @@ public class SimpleEvents {
 				.description("Called when an <a href='../classes/#entity'>entity</a> enters a vehicle, either deliberately (players) or by falling into them (mobs).")
 				.examples("")
 				.since("1.0");
-		Skript.registerEvent("Vehicle Exit", SimpleEvent.class, VehicleExitEvent.class, "vehicle exit", "exit[ing] [a] vehicle")
-				.description("Called when an entity exits a vehicle.")
-				.examples("")
-				.since("1.0");
+		if (Skript.classExists("org.spigotmc.event.entity.EntityMountEvent")) {
+			Skript.registerEvent("Entity Mount", SimpleEvent.class, EntityMountEvent.class, "mount[ing]")
+					.description("Called when entity starts riding another.")
+					.examples("")
+					.since("2.2-dev13b");
+			Skript.registerEvent("Entity Dismount", SimpleEvent.class, EntityDismountEvent.class, "dismount[ing]")
+					.description("Called when an entity dismounts.")
+					.examples("")
+					.since("2.2-dev13b");
+		}
 		Skript.registerEvent("World Init", SimpleEvent.class, WorldInitEvent.class, "world init")
 				.description("Called when a world is initialised. As all default worlds are initialised before any scripts are loaded, this event is only called for newly created worlds.",
 						"World management plugins might change the behaviour of this event though.")

src/main/java/ch/njol/skript/expressions/ExprVehicle.java

@@ -26,8 +26,11 @@
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
 import org.eclipse.jdt.annotation.Nullable;
+import org.spigotmc.event.entity.EntityDismountEvent;
+import org.spigotmc.event.entity.EntityMountEvent;
 
 import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Converter;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -47,6 +50,9 @@
 @Examples({"vehicle of the player is a minecart"})
 @Since("2.0")
 public class ExprVehicle extends SimplePropertyExpression<Entity, Entity> {
+	
+	static final boolean hasMountEvents = Skript.classExists("org.spigotmc.event.entity.EntityMountEvent");
+	
 	static {
 		register(ExprVehicle.class, Entity.class, "vehicle[s]", "entities");
 	}
@@ -63,6 +69,14 @@ public Entity convert(final Entity p) {
 				if (getTime() >= 0 && e instanceof VehicleExitEvent && p.equals(((VehicleExitEvent) e).getExited()) && !Delay.isDelayed(e)) {
 					return ((VehicleExitEvent) e).getVehicle();
 				}
+				if (hasMountEvents) {
+					if (getTime() >= 0 && e instanceof EntityMountEvent && p.equals(((EntityMountEvent) e).getEntity()) && !Delay.isDelayed(e)) {
+						return ((EntityMountEvent) e).getMount();
+					}
+					if (getTime() >= 0 && e instanceof EntityDismountEvent && p.equals(((EntityDismountEvent) e).getEntity()) && !Delay.isDelayed(e)) {
+						return ((EntityDismountEvent) e).getDismounted();
+					}
+				}
 				return p.getVehicle();
 			}
 		});