diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java index 499c0ec03..ec37a112a 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/weapon/FlamingAttribute.java @@ -6,6 +6,7 @@ import mineplex.game.clans.items.attributes.AttackAttribute; import mineplex.game.clans.items.attributes.AttributeType; import mineplex.game.clans.items.generation.ValueDistribution; +import org.bukkit.GameMode; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -39,7 +40,7 @@ public class FlamingAttribute extends AttackAttribute { if(attacker instanceof Player && ClansManager.getInstance().isSafe((Player) attacker)) return; if(defender instanceof Player && ClansManager.getInstance().isSafe((Player) defender)) return; - + if(attacker instanceof Player && ((Player)attacker).getGameMode().equals(GameMode.CREATIVE)) return; defender.setFireTicks(_fireDuration); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java index c49fa95be..bdc9c4491 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/GiantsBroadsword.java @@ -15,8 +15,7 @@ public class GiantsBroadsword extends LegendaryItem { public static final int SLOW_AMPLIFIER = 43; public static final int REGEN_AMPLIFIER = 4; - public static final int EFFECT_DURATION = 20; // Duration of potion effect (in ticks) - + public GiantsBroadsword() { super("Giants Broadsword", new String[]{ @@ -40,6 +39,11 @@ public class GiantsBroadsword extends LegendaryItem UtilParticle.PlayParticle(ParticleType.HEART, wielder.getEyeLocation().add(0, 0.25, 0), -.5f + (float) Math.random(), -.5f + (float) Math.random(), -.5f + (float) Math.random(), .2f, 1, ViewDist.NORMAL); wielder.playSound(wielder.getLocation(), Sound.LAVA_POP, 1f, 2f); return; + }else{ + if(wielder.hasPotionEffect(PotionEffectType.REGENERATION)) { + wielder.removePotionEffect(PotionEffectType.REGENERATION); + wielder.removePotionEffect(PotionEffectType.SLOW); + } } UtilParticle.PlayParticle(ParticleType.MAGIC_CRIT, wielder.getLocation().add(0, 1, 0), 0, 0, 0, .2f, 3, ViewDist.NORMAL); @@ -61,7 +65,7 @@ public class GiantsBroadsword extends LegendaryItem private void buffPlayer(Player player) { - grantPotionEffect(player, PotionEffectType.SLOW, EFFECT_DURATION, SLOW_AMPLIFIER); - grantPotionEffect(player, PotionEffectType.REGENERATION, EFFECT_DURATION, REGEN_AMPLIFIER); //Regen + grantPotionEffect(player, PotionEffectType.SLOW, 10000000, SLOW_AMPLIFIER); + grantPotionEffect(player, PotionEffectType.REGENERATION, 1000000, REGEN_AMPLIFIER); //Regen } }