From c0b7eb526aabe095d117670c19ed91ee7721c9ad Mon Sep 17 00:00:00 2001 From: NuclearW Date: Thu, 9 May 2013 11:00:28 -0400 Subject: [PATCH] Change Squid variables to Creature. --- .../gmail/nossr50/runnables/skills/KrakenAttackTask.java | 8 ++++---- .../com/gmail/nossr50/skills/fishing/FishingManager.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java index c90f315cf..51cbccba1 100644 --- a/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java +++ b/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java @@ -3,25 +3,25 @@ package com.gmail.nossr50.runnables.skills; import org.bukkit.Location; import org.bukkit.Sound; import org.bukkit.World; +import org.bukkit.entity.Creature; import org.bukkit.entity.Player; -import org.bukkit.entity.Squid; import org.bukkit.scheduler.BukkitRunnable; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.util.Misc; public class KrakenAttackTask extends BukkitRunnable { - private Squid kraken; + private Creature kraken; private Player player; private Location location; private final boolean GLOBAL_SOUNDS = AdvancedConfig.getInstance().getKrakenGlobalSoundsEnabled(); - public KrakenAttackTask(Squid kraken, Player player) { + public KrakenAttackTask(Creature kraken, Player player) { this.kraken = kraken; this.player = player; } - public KrakenAttackTask(Squid kraken, Player player, Location location) { + public KrakenAttackTask(Creature kraken, Player player, Location location) { this.kraken = kraken; this.player = player; this.location = location; 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 5f6d490bc..c1329158b 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -14,6 +14,7 @@ import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Creature; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Fish; @@ -110,7 +111,7 @@ public class FishingManager extends SkillManager { player.setItemInHand(null); - Squid kraken = (Squid) world.spawnEntity(player.getEyeLocation(), EntityType.SQUID); + Creature kraken = (Squid) world.spawnEntity(player.getEyeLocation(), EntityType.SQUID); kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName()); if (!kraken.isValid()) {