From 2fe1d506b7f583d25fd3ad0b5c8bace9cd19ebcb Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 8 Oct 2019 02:01:26 -0400 Subject: [PATCH] Auto tame tameable mounts. --- .../epicbosses/mechanics/boss/EntityTypeMechanic.java | 6 ++++++ .../epicbosses/mechanics/minions/EntityTypeMechanic.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/EntityTypeMechanic.java b/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/EntityTypeMechanic.java index edf2e64..49181a4 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/EntityTypeMechanic.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/boss/EntityTypeMechanic.java @@ -8,7 +8,9 @@ import com.songoda.epicbosses.holder.ActiveBossHolder; import com.songoda.epicbosses.mechanics.IBossMechanic; import com.songoda.epicbosses.utils.Debug; import com.songoda.epicbosses.utils.EntityFinder; +import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Tameable; /** * @author Charles Cullen @@ -45,6 +47,10 @@ public class EntityTypeMechanic implements IBossMechanic { return false; } + if (lowerLivingEntity instanceof Tameable) { + ((Tameable) lowerLivingEntity).setTamed(true); + } + lowerLivingEntity.setPassenger(livingEntity); } } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/minions/EntityTypeMechanic.java b/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/minions/EntityTypeMechanic.java index 6d9b571..795f397 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/minions/EntityTypeMechanic.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/mechanics/minions/EntityTypeMechanic.java @@ -8,7 +8,9 @@ import com.songoda.epicbosses.holder.ActiveMinionHolder; import com.songoda.epicbosses.mechanics.IMinionMechanic; import com.songoda.epicbosses.utils.Debug; import com.songoda.epicbosses.utils.EntityFinder; +import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Tameable; /** * @author Charles Cullen @@ -46,6 +48,10 @@ public class EntityTypeMechanic implements IMinionMechanic { return false; } + if (lowerLivingEntity instanceof Tameable) { + ((Tameable) lowerLivingEntity).setTamed(true); + } + lowerLivingEntity.setPassenger(livingEntity); } }