From 5c4c3cf59c7b3e392cef37a8ead7d1d30f70127d Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 1 May 2013 22:50:12 -0400 Subject: [PATCH] The Kraken hates boats. --- .../gmail/nossr50/skills/fishing/FishingManager.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index 5a3e2f9e0..7bd2f9abe 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -74,6 +74,14 @@ public class FishingManager extends SkillManager { World world = player.getWorld(); player.setPlayerWeather(WeatherType.DOWNFALL); + + Entity vehicle = player.getVehicle(); + + if (vehicle != null && vehicle.getType() == EntityType.BOAT) { + vehicle.eject(); + vehicle.remove(); + } + player.teleport(player.getTargetBlock(null, 100).getLocation(), TeleportCause.PLUGIN); Location location = player.getLocation(); @@ -91,6 +99,8 @@ public class FishingManager extends SkillManager { kraken.setHealth(kraken.getMaxHealth()); player.setItemInHand(null); + + new KrakenAttackTask(kraken, player).runTaskTimer(mcMMO.p, 20L, 20L); fishingTries = 1; return true;