EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Summon the kraken at will!

Browse Source
This commit is contained in:
GJ
2013-05-03 16:14:03 -04:00
parent b07cf6bdde
commit 8e0a1f4f70
5 changed files with 104 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ import com.gmail.nossr50.util.skills.SkillUtils;
public class FishingManager extends SkillManager {
private final long FISHING_COOLDOWN_SECONDS = 1000L;
private int fishingTries = 1;
private int fishingTries = 0;
private long fishingTimestamp = 0L;
public FishingManager(McMMOPlayer mcMMOPlayer) {
@ -65,12 +65,12 @@ public class FishingManager extends SkillManager {
return Permissions.masterAngler(getPlayer());
}
// public boolean unleashTheKraken() {
//
// }
public boolean unleashTheKraken() {
return unleashTheKraken(true);
}
private boolean unleashTheKraken() {
if (fishingTries < AdvancedConfig.getInstance().getKrakenTriesBeforeRelease() || fishingTries <= Misc.getRandom().nextInt(200)) {
private boolean unleashTheKraken(boolean forceSpawn) {
if (!forceSpawn && (fishingTries < AdvancedConfig.getInstance().getKrakenTriesBeforeRelease() || fishingTries <= Misc.getRandom().nextInt(200))) {
return false;
}
@ -118,7 +118,10 @@ public class FishingManager extends SkillManager {
int attackInterval = AdvancedConfig.getInstance().getKrakenAttackInterval() * 20;
new KrakenAttackTask(kraken, player, player.getLocation()).runTaskTimer(mcMMO.p, attackInterval, attackInterval);
fishingTries = 1;
if (!forceSpawn) {
fishingTries = 0;
}
return true;
}
@ -128,7 +131,10 @@ public class FishingManager extends SkillManager {
int attackInterval = AdvancedConfig.getInstance().getKrakenAttackInterval() * 20;
new KrakenAttackTask(kraken, player).runTaskTimer(mcMMO.p, attackInterval, attackInterval);
fishingTries = 1;
if (!forceSpawn) {
fishingTries = 0;
}
return true;
}
@ -140,9 +146,9 @@ public class FishingManager extends SkillManager {
long currentTime = System.currentTimeMillis();
boolean hasFished = currentTime < fishingTimestamp + FISHING_COOLDOWN_SECONDS;
fishingTries = hasFished ? fishingTries + 1 : fishingTries - 1;
fishingTries = hasFished ? fishingTries + 1 : Math.max(fishingTries - 1, 0);
fishingTimestamp = currentTime;
return unleashTheKraken();
return unleashTheKraken(false);
}
public boolean canIceFish(Block block) {