diff options
| author | Krakenied <Krakenied1@gmail.com> | 2023-12-14 10:49:49 +0100 |
|---|---|---|
| committer | Leonardo Bishop <13875753+LMBishop@users.noreply.github.com> | 2023-12-21 16:08:14 +0000 |
| commit | 5b61fc499c8c6a78f490b5fa013d74fe74af74df (patch) | |
| tree | be996899fff9e735de86716e7497276ce0b95adb /bukkit/src/main/java/com/leonardobishop | |
| parent | 1b44d06cc23a7dae148eb9d8cbca7fbc646e7627 (diff) | |
Fix walking task type not detecting horse mode
Diffstat (limited to 'bukkit/src/main/java/com/leonardobishop')
| -rw-r--r-- | bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java index 621a9ab7..8cad2df2 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java @@ -10,9 +10,9 @@ import com.leonardobishop.quests.common.quest.Quest; import com.leonardobishop.quests.common.quest.Task; import org.bukkit.entity.Boat; import org.bukkit.entity.Entity; -import org.bukkit.entity.Minecart; import org.bukkit.entity.Pig; import org.bukkit.entity.Player; +import org.bukkit.entity.minecart.RideableMinecart; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; @@ -53,8 +53,8 @@ public final class WalkingTaskType extends BukkitTaskType { } Player player = event.getPlayer(); - if (player.isInsideVehicle()) { - return; + if (player.getVehicle() instanceof RideableMinecart) { + return; // minecarts movement is already handled by VehicleMoveEvent } handle(player); @@ -93,7 +93,7 @@ public final class WalkingTaskType extends BukkitTaskType { final String mode = (String) task.getConfigValue("mode"); if (mode != null && !validateMode(player, mode)) { - super.debug("Player's mode does not match required mode, continuing...", quest.getId(), task.getId(), player.getUniqueId()); + super.debug("Player mode does not match required mode, continuing...", quest.getId(), task.getId(), player.getUniqueId()); continue; } @@ -116,7 +116,7 @@ public final class WalkingTaskType extends BukkitTaskType { case "boat" -> player.getVehicle() instanceof Boat; case "horse" -> plugin.getVersionSpecificHandler().isPlayerOnHorse(player); case "pig" -> player.getVehicle() instanceof Pig; - case "minecart" -> player.getVehicle() instanceof Minecart; + case "minecart" -> player.getVehicle() instanceof RideableMinecart; case "strider" -> plugin.getVersionSpecificHandler().isPlayerOnStrider(player); case "sneaking" -> // sprinting does not matter player.isSneaking() && !player.isSwimming() && !player.isFlying() |