Support leashable boats

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/MCLeashable.java

@@ -0,0 +1,6 @@
+package com.laytonsmith.abstraction;
+public interface MCLeashable {
+	MCEntity getLeashHolder();
+	boolean isLeashed();
+	void setLeashHolder(MCEntity holder);
+}

src/main/java/com/laytonsmith/abstraction/MCLivingEntity.java

@@ -9,7 +9,7 @@
 import java.util.HashSet;
 import java.util.List;
 
-public interface MCLivingEntity extends MCEntity, MCProjectileSource {
+public interface MCLivingEntity extends MCEntity, MCLeashable, MCProjectileSource {
 
 	boolean addEffect(MCPotionEffectType type, int strength, int ticks, boolean ambient, boolean particles, boolean icon);
 
@@ -47,8 +47,6 @@ public interface MCLivingEntity extends MCEntity, MCProjectileSource {
 
 	double getLastDamage();
 
-	MCEntity getLeashHolder();
-
 	MCLivingEntity getTarget(Target t);
 
 	MCBlock getTargetBlock(HashSet<MCMaterial> transparent, int maxDistance);
@@ -69,8 +67,6 @@ public interface MCLivingEntity extends MCEntity, MCProjectileSource {
 
 	boolean isGliding();
 
-	boolean isLeashed();
-
 	boolean hasAI();
 
 	void resetMaxHealth();
@@ -83,8 +79,6 @@ public interface MCLivingEntity extends MCEntity, MCProjectileSource {
 
 	void setLastDamage(double damage);
 
-	void setLeashHolder(MCEntity holder);
-
 	void setMaxHealth(double health);
 
 	void setMaximumAir(int ticks);

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCBoat.java

@@ -1,5 +1,7 @@
 package com.laytonsmith.abstraction.bukkit.entities;
 
+import com.laytonsmith.abstraction.MCEntity;
+import com.laytonsmith.abstraction.bukkit.BukkitMCServer;
 import com.laytonsmith.abstraction.entities.MCBoat;
 import com.laytonsmith.abstraction.enums.MCTreeSpecies;
 import com.laytonsmith.abstraction.enums.MCVersion;
@@ -34,4 +36,31 @@ public void setWoodType(MCTreeSpecies type) {
 		}
 	}
 
+	@Override
+	public MCEntity getLeashHolder() {
+		return new BukkitMCEntity(b.getLeashHolder());
+	}
+
+	@Override
+	public boolean isLeashed() {
+		if(((BukkitMCServer) Static.getServer()).isPaper()
+				&& Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_21_3)
+				|| Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_21_10)) {
+			return b.isLeashed();
+		}
+		return false;
+	}
+
+	@Override
+	public void setLeashHolder(MCEntity holder) {
+		if(((BukkitMCServer) Static.getServer()).isPaper()
+				&& Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_21_3)
+				|| Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_21_10)) {
+			if(holder == null) {
+				b.setLeashHolder(null);
+			} else {
+				b.setLeashHolder((Entity) holder.getHandle());
+			}
+		}
+	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java

@@ -381,10 +381,7 @@ public void kill() {
 
 	@Override
 	public MCEntity getLeashHolder() {
-		if(le.isLeashed()) {
-			return BukkitConvertor.BukkitGetCorrectEntity(le.getLeashHolder());
-		}
-		return null;
+		return new BukkitMCEntity(le.getLeashHolder());
 	}
 
 	@Override

src/main/java/com/laytonsmith/abstraction/entities/MCBoat.java

@@ -1,8 +1,9 @@
 package com.laytonsmith.abstraction.entities;
 
+import com.laytonsmith.abstraction.MCLeashable;
 import com.laytonsmith.abstraction.enums.MCTreeSpecies;
 
-public interface MCBoat extends MCVehicle {
+public interface MCBoat extends MCVehicle, MCLeashable {
 	MCTreeSpecies getWoodType();
 	void setWoodType(MCTreeSpecies type);
 }

src/main/java/com/laytonsmith/core/functions/MobManagement.java

@@ -3,6 +3,7 @@
 import com.laytonsmith.PureUtilities.Common.StringUtils;
 import com.laytonsmith.PureUtilities.Version;
 import com.laytonsmith.abstraction.MCAttributeModifier;
+import com.laytonsmith.abstraction.MCLeashable;
 import com.laytonsmith.abstraction.MCNamespacedKey;
 import com.laytonsmith.abstraction.blocks.MCMaterial;
 import com.laytonsmith.abstraction.MCAnimalTamer;
@@ -1062,11 +1063,14 @@ public static class get_leashholder extends EntityManagement.EntityGetterFunctio
 
 		@Override
 		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
-			MCLivingEntity le = Static.getLivingEntity(args[0], t);
-			if(!le.isLeashed()) {
+			MCEntity e = Static.getEntity(args[0], t);
+			if(!(e instanceof MCLeashable)) {
+				throw new CREBadEntityException("Entity type is not leashable.", t);
+			}
+			if(!((MCLeashable) e).isLeashed()) {
 				return CNull.NULL;
 			}
-			return new CString(le.getLeashHolder().getUniqueId().toString(), t);
+			return new CString(((MCLeashable) e).getLeashHolder().getUniqueId().toString(), t);
 		}
 
 		@Override
@@ -1076,8 +1080,9 @@ public String getName() {
 
 		@Override
 		public String docs() {
-			return "string {entityUUID} Returns the UUID of the entity that is holding the given living entity's leash,"
-					+ " or null if it isn't being held.";
+			return "string {entityUUID} Returns the UUID of the entity that is holding the given entity's leash,"
+					+ " or null if it isn't being held. Only mobs and boats can be leashed, otherwise a"
+					+ " BadEntityException is thrown. Boats are only supported on Paper 1.21.3+ and Spigot 1.21.10+.";
 		}
 
 		@Override
@@ -1091,14 +1096,17 @@ public static class set_leashholder extends EntityManagement.EntitySetterFunctio
 
 		@Override
 		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
-			MCLivingEntity le = Static.getLivingEntity(args[0], t);
+			MCEntity e = Static.getEntity(args[0], t);
 			MCEntity holder;
 			if(args[1] instanceof CNull) {
 				holder = null;
 			} else {
 				holder = Static.getEntity(args[1], t);
 			}
-			le.setLeashHolder(holder);
+			if(!(e instanceof MCLeashable)) {
+				throw new CREBadEntityException("Entity type is not leashable.", t);
+			}
+			((MCLeashable) e).setLeashHolder(holder);
 			return CVoid.VOID;
 		}
 
@@ -1109,11 +1117,10 @@ public String getName() {
 
 		@Override
 		public String docs() {
-			return "void {entityUUID, entityUUID} The first argument is the entity to be held on a leash,"
-					+ " and must be living. The second is the holder of the leash. This does not have to be living,"
-					+ " but the only non-living entity that will persist as a holder across restarts is the leash hitch."
-					+ " Players, bats, enderdragons, withers and certain other entities can not be held by leashes due"
-					+ " to minecraft limitations.";
+			return "void {entityUUID, holderUUID} The first argument is the entity to be held on a leash, and must be a"
+					+ " mob or a boat. The second is the holder of the leash and can be many types of entities,"
+					+ " notably a leash hitch. Certain entity types may be excluded from being leashed depending on the"
+					+ " Minecraft version. Boats are only supported on Paper 1.21.3+ and Spigot 1.21.10+.";
 		}
 
 		@Override