fixed cooldowns and shortened them

This commit is contained in:
Super_ 2020-01-12 11:18:41 -05:00
parent 939e0730fd
commit 1ee1cbca2b

View File

@ -49,26 +49,26 @@ public class ItemFun extends FreedomService
private static final String COOLDOWN_MESSAGE = ChatColor.RED + "You're on cooldown for this feature."; private static final String COOLDOWN_MESSAGE = ChatColor.RED + "You're on cooldown for this feature.";
private final Map<Player, String> cooldownTracker = new HashMap<>(); private final Map<String, String> cooldownTracker = new HashMap<>();
private final Map<Player, Float> orientationTracker = new HashMap<>(); private final Map<Player, Float> orientationTracker = new HashMap<>();
private void cooldown(Player player, String feature, int seconds) private void cooldown(Player player, String feature, int seconds)
{ {
cooldownTracker.put(player, feature); cooldownTracker.put(player.getName(), feature);
new BukkitRunnable() new BukkitRunnable()
{ {
@Override @Override
public void run() public void run()
{ {
cooldownTracker.remove(player); cooldownTracker.remove(player.getName());
} }
}.runTaskLater(plugin, seconds * 20); }.runTaskLater(plugin, seconds * 20);
} }
public boolean onCooldown(Player player, String feature) public boolean onCooldown(Player player, String feature)
{ {
return cooldownTracker.containsKey(player) && cooldownTracker.containsValue(feature); return cooldownTracker.containsKey(player.getName()) && cooldownTracker.containsValue(feature);
} }
public ItemFun(TotalFreedomMod plugin) public ItemFun(TotalFreedomMod plugin)
@ -379,7 +379,7 @@ public class ItemFun extends FreedomService
if (sd.validate(stack, "Electrical Diamond Sword")) if (sd.validate(stack, "Electrical Diamond Sword"))
{ {
player.getWorld().strikeLightning(player.getTargetBlock(null, 20).getLocation()); player.getWorld().strikeLightning(player.getTargetBlock(null, 20).getLocation());
cooldown(player, "eds", 60); cooldown(player, "eds", 15);
} }
break; break;
} }
@ -398,7 +398,7 @@ public class ItemFun extends FreedomService
{ {
Entity fireball = player.getWorld().spawnEntity(player.getLocation(), EntityType.FIREBALL); Entity fireball = player.getWorld().spawnEntity(player.getLocation(), EntityType.FIREBALL);
fireball.setVelocity(player.getLocation().getDirection()); fireball.setVelocity(player.getLocation().getDirection());
cooldown(player, "ss", 60); cooldown(player, "ss", 3);
} }
} }
} }