TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-08-15 16:06:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix AvatarState not starting

Browse source
This commit is contained in:
MistPhizzle 2014-07-17 23:44:31 -04:00
parent a74ef765b8
commit b2d8d562ad
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/com/projectkorra/ProjectKorra/Ability/AvatarState.java
View file

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
@ -17,8 +18,8 @@ import com.projectkorra.ProjectKorra.ProjectKorra;
public class AvatarState {
public static ConcurrentHashMap<Player, AvatarState> instances = new ConcurrentHashMap<Player, AvatarState>();
public static ConcurrentHashMap<String, Long> startTimes = new ConcurrentHashMap<String, Long>();
public static Map<String, Long> cooldowns = new HashMap<String, Long>();
public static Map<String, Long> startTimes = new HashMap<String, Long>();
public static FileConfiguration config = ProjectKorra.plugin.getConfig();
private static final long cooldown = ProjectKorra.plugin.getConfig().getLong("Abilities.AvatarState.Cooldown");
@ -42,8 +43,8 @@ public class AvatarState {
this.player = player;
if (instances.containsKey(player)) {
instances.remove(player);
if (startTimes.containsKey(player.getName())) {
startTimes.remove(player.getName());
if (cooldowns.containsKey(player.getName())) {
cooldowns.remove(player.getName());
}
return;
}
@ -77,19 +78,19 @@ public class AvatarState {
private boolean progress() {
if (!Methods.canBend(player.getName(), StockAbilities.AvatarState.name())) {
instances.remove(player);
if (startTimes.containsKey(player.getName())) {
startTimes.remove(player.getName());
if (cooldowns.containsKey(player.getName())) {
cooldowns.remove(player.getName());
}
return false;
}
if (startTimes.containsKey(player.getName())) {
if (startTimes.get(player.getName()) + duration >= System.currentTimeMillis()) {
if (startTimes.get(player.getName()) + duration < System.currentTimeMillis()) {
startTimes.remove(player.getName());
instances.remove(player);
return false;
}
}
addPotionEffects();
return true;
}