Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 08:09:39 +01:00
Code Issues Projects Releases Wiki Activity

Change Squid variables to Creature.

Browse Source
This commit is contained in:
NuclearW 2013-05-09 11:00:28 -04:00
parent 7b7196a8c4
commit c0b7eb526a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
View File

@ -3,25 +3,25 @@ package com.gmail.nossr50.runnables.skills;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Creature;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Squid;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.util.Misc; import com.gmail.nossr50.util.Misc;
public class KrakenAttackTask extends BukkitRunnable { public class KrakenAttackTask extends BukkitRunnable {
private Squid kraken; private Creature kraken;
private Player player; private Player player;
private Location location; private Location location;
private final boolean GLOBAL_SOUNDS = AdvancedConfig.getInstance().getKrakenGlobalSoundsEnabled(); private final boolean GLOBAL_SOUNDS = AdvancedConfig.getInstance().getKrakenGlobalSoundsEnabled();
public KrakenAttackTask(Squid kraken, Player player) { public KrakenAttackTask(Creature kraken, Player player) {
this.kraken = kraken; this.kraken = kraken;
this.player = player; this.player = player;
} }
public KrakenAttackTask(Squid kraken, Player player, Location location) { public KrakenAttackTask(Creature kraken, Player player, Location location) {
this.kraken = kraken; this.kraken = kraken;
this.player = player; this.player = player;
this.location = location; this.location = location;

3
src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java
View File

@ -14,6 +14,7 @@ import org.bukkit.block.Biome;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Creature;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fish; import org.bukkit.entity.Fish;
@ -110,7 +111,7 @@ public class FishingManager extends SkillManager {
player.setItemInHand(null); 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()); kraken.setCustomName(AdvancedConfig.getInstance().getKrakenName());
if (!kraken.isValid()) { if (!kraken.isValid()) {