From 6385aacbac1d15ed86350c031de483d49e7f1249 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Sat, 13 Feb 2016 14:28:39 -0500 Subject: [PATCH] - Updates --- .../game/arcade/game/games/minecraftleague/data/TeamBeacon.java | 2 +- .../variation/wither/data/WitherMinionManager.java | 2 +- .../nautilus/game/arcade/managers/SecondaryDamageManager.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/data/TeamBeacon.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/data/TeamBeacon.java index 725f61275..f2f0ad8d3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/data/TeamBeacon.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/data/TeamBeacon.java @@ -55,7 +55,7 @@ public class TeamBeacon if (player.getLocation().distance(_core) < 15) { player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 5 * 20, 0)); - player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 5 * 20, 0)); + //player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 5 * 20, 0)); player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 5 * 20, 0)); player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 5 * 20, 0)); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/variation/wither/data/WitherMinionManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/variation/wither/data/WitherMinionManager.java index 9184bba0d..77c1c321c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/variation/wither/data/WitherMinionManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/variation/wither/data/WitherMinionManager.java @@ -113,7 +113,7 @@ public class WitherMinionManager implements Listener e.setCustomName(C.cRed + "Wither Skeleton"); ((CraftSkeleton)e).getEquipment().setChestplate(new ItemStack(Material.IRON_CHESTPLATE)); ((CraftSkeleton)e).getEquipment().setLeggings(new ItemStack(Material.IRON_LEGGINGS)); - ((Skeleton)e).addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 9999999, 1)); + ((Skeleton)e).addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 9999999, 3)); UtilTextMiddle.display("", C.cGray + "A Wither Skeleton has spawned!"); _selected = -1; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/SecondaryDamageManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/SecondaryDamageManager.java index e27b84004..81eca59dd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/SecondaryDamageManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/SecondaryDamageManager.java @@ -33,6 +33,8 @@ public class SecondaryDamageManager implements Listener event.setCancelled(true); return; } + if (!(event.getEntity() instanceof LivingEntity)) + return; LivingEntity ent = (LivingEntity) event.getEntity(); if (ent.getWorld().getName().equals("world"))