From 3d1694b75ceb31a550683946db54fb5e00ae5874 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Fri, 21 Oct 2016 22:50:35 -0400 Subject: [PATCH] General Cleanup and Bugfix --- .../gpowers/listeners/gPowerApplyingTask.java | 26 +++++++++---------- .../gpowers/listeners/gPowerListener.java | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/alisolarflare/gpowers/listeners/gPowerApplyingTask.java b/src/alisolarflare/gpowers/listeners/gPowerApplyingTask.java index a15c04c..d110477 100644 --- a/src/alisolarflare/gpowers/listeners/gPowerApplyingTask.java +++ b/src/alisolarflare/gpowers/listeners/gPowerApplyingTask.java @@ -29,23 +29,23 @@ public class gPowerApplyingTask extends BukkitRunnable{ private void activatePower(Player player, String colour) { if ((colour.startsWith("grey") || colour.startsWith("gra")) && (player.getWorld().getTime() > 12575 && player.getWorld().getTime() < 22925)){ - player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 100, 1, true, false, Color.GRAY)); - player.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, 100, 1, true, false, Color.GRAY)); + player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 200, 0, true, false, Color.GRAY)); + player.addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, 300, 0, true, false, Color.GRAY)); }else if (colour.startsWith("r")){ - player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 100, 1, true, false, Color.GRAY)); + player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 200, 0, true, false, Color.RED)); }else if (colour.startsWith("o")){ - player.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, 100, 1, true, false, Color.GRAY)); - player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 100, 1, true, false, Color.GRAY)); - }else if (colour.startsWith("y") && player.getLocation().getBlock().getLightFromSky() == 15){ - player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 100, 1, true, false, Color.GRAY)); - }else if (colour.startsWith("g")){ - player.addPotionEffect(new PotionEffect(PotionEffectType.LUCK, 100, 1, true, false, Color.GRAY)); - player.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING, 100, 1, true, false, Color.GRAY)); + player.addPotionEffect(new PotionEffect(PotionEffectType.FIRE_RESISTANCE, 200, 0, true, false, Color.ORANGE)); + player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 200, 0, true, false, Color.ORANGE)); + }else if (colour.startsWith("y") && player.getLocation().getBlock().getLightFromSky() == 15 && player.getLocation().getBlock().getLightFromBlocks() == 15){ + player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 200, 0, true, false, Color.YELLOW)); + }else if (colour.startsWith("g") && !colour.startsWith("gra") && !colour.startsWith("grey")){ + player.addPotionEffect(new PotionEffect(PotionEffectType.LUCK, 200, 1, true, false, Color.GREEN)); + player.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING, 200, 0, true, false, Color.GREEN)); }else if (colour.startsWith("b")){ - player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 100, 1, true, false, Color.GRAY)); - player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 100, 1, true, false, Color.GRAY)); + player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 200, 1, true, false, Color.BLUE)); + player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 200, 0, true, false, Color.BLUE)); }else if (colour.startsWith("p")){ - player.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST, 100, 1, true, false, Color.GRAY)); + player.addPotionEffect(new PotionEffect(PotionEffectType.HEALTH_BOOST, 200, 0, true, false, Color.PURPLE)); }else{ } } diff --git a/src/alisolarflare/gpowers/listeners/gPowerListener.java b/src/alisolarflare/gpowers/listeners/gPowerListener.java index c2ea39d..c8197e8 100644 --- a/src/alisolarflare/gpowers/listeners/gPowerListener.java +++ b/src/alisolarflare/gpowers/listeners/gPowerListener.java @@ -12,7 +12,7 @@ public class gPowerListener implements Listener{ public gPowerListener(AliPresents plugin){ this.plugin = plugin; this.powerApplyingTask = new gPowerApplyingTask(this.plugin); - bukkitTask = powerApplyingTask.runTaskTimer(plugin, 100, 100); + bukkitTask = powerApplyingTask.runTaskTimer(plugin, 190, 190); } }