Removed PassengerUtils class and replaced methods in referencing classes

src/main/java/ch/njol/skript/effects/EffVehicle.java

@@ -23,7 +23,6 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.bukkitutil.PassengerUtils;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
@@ -45,72 +44,70 @@
 public class EffVehicle extends Effect {
 	static {
 		Skript.registerEffect(EffVehicle.class,
-				"(make|let|force) %entities% [to] (ride|mount) [(in|on)] %"+ (PassengerUtils.hasMultiplePassenger() ? "entities" : "entity") +"/entitydatas%",
-				"(make|let|force) %entities% [to] (dismount|(dismount|leave) (from|of|) (any|the[ir]|his|her|) vehicle[s])",
-				"(eject|dismount) (any|the|) passenger[s] (of|from) %entities%");
+				"(make|let|force) %entities% [to] (ride|mount) [in|on] %entities/entitydatas%",
+				"(make|let|force) %entities% [to] (dismount|(dismount|leave) [from|of] [any|the[ir]|his|her] vehicle[s])",
+				"(eject|dismount) [any|the] passenger[s] (of|from) %entities%");
 	}
-	
+
 	@Nullable
 	private Expression<Entity> passengers;
 	@Nullable
 	private Expression<?> vehicles;
 
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		passengers = matchedPattern == 2 ? null : (Expression<Entity>) exprs[0];
 		vehicles = matchedPattern == 1 ? null : exprs[exprs.length - 1];
-		if (!PassengerUtils.hasMultiplePassenger() && passengers != null && vehicles != null && !passengers.isSingle() && vehicles.isSingle() && Entity.class.isAssignableFrom(vehicles.getReturnType()))
-			Skript.warning("An entity can only have one passenger");
 		return true;
 	}
 
 	@Override
-	protected void execute(final Event e) {
-		final Expression<?> vehicles = this.vehicles;
-		final Expression<Entity> passengers = this.passengers;
+	protected void execute(Event e) {
+		Expression<?> vehicles = this.vehicles;
+		Expression<Entity> passengers = this.passengers;
 		if (vehicles == null) {
 			assert passengers != null;
-			for (final Entity p : passengers.getArray(e))
-				p.leaveVehicle();
+			for (Entity passenger : passengers.getArray(e))
+				passenger.leaveVehicle();
 			return;
 		}
 		if (passengers == null) {
 			assert vehicles != null;
-			for (final Object v : vehicles.getArray(e))
-				((Entity) v).eject();
+			for (Object vehicle : vehicles.getArray(e))
+				((Entity) vehicle).eject();
 			return;
 		}
-		final Object[] vs = vehicles.getArray(e);
-		if (vs.length == 0)
+		Object[] vehiclesArray = vehicles.getArray(e);
+		if (vehiclesArray.length == 0)
 			return;
-		final Entity[] ps = passengers.getArray(e);
-		if (ps.length == 0)
+		Entity[] passengersArray = passengers.getArray(e);
+		if (passengersArray.length == 0)
 			return;
-		for (final Object v : vs) {
-			if (v instanceof Entity) {
-				((Entity) v).eject();
-				for (Entity p : ps){
-					assert p != null;
-					p.leaveVehicle();
-					PassengerUtils.addPassenger((Entity)v, p); //For 1.9 and lower, it will only set the last one.
+		for (Object vehicle : vehiclesArray) {
+			if (vehicle instanceof Entity) {
+				((Entity) vehicle).eject();
+				for (Entity passenger : passengersArray){
+					assert passenger != null;
+					passenger.leaveVehicle();
+					((Entity) vehicle).addPassenger(passenger);
 				}
 			} else {
-				for (final Entity p : ps) {
-					assert p != null : passengers;
-					final Entity en = ((EntityData<?>) v).spawn(p.getLocation());
-					if (en == null)
+				for (Entity passenger : passengersArray) {
+					assert passenger != null : passengers;
+					Entity entity = ((EntityData<?>) vehicle).spawn(passenger.getLocation());
+					if (entity == null)
 						return;
-					PassengerUtils.addPassenger(en, p);
+					entity.addPassenger(passenger);
 				}
 			}
 		}
 	}
 
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		final Expression<?> vehicles = this.vehicles;
-		final Expression<Entity> passengers = this.passengers;
+	public String toString(@Nullable Event e, boolean debug) {
+		Expression<?> vehicles = this.vehicles;
+		Expression<Entity> passengers = this.passengers;
 		if (vehicles == null) {
 			assert passengers != null;
 			return "make " + passengers.toString(e, debug) + " dismount";
@@ -121,5 +118,4 @@ public String toString(final @Nullable Event e, final boolean debug) {
 		}
 		return "make " + passengers.toString(e, debug) + " ride " + vehicles.toString(e, debug);
 	}
-
 }