From 1591c1592afbf64795f28a6e0ce9573583dff077 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 5 Aug 2017 18:01:35 +0100 Subject: [PATCH] Typos --- .../kits/KitUndeadSummoner.java | 2 +- .../castlesiegenew/perks/PerkMobPotions.java | 29 +++++++++++++++++-- .../managers/ProgressingKitManager.java | 3 ++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java index 7a00040fe..65c62d8c0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadSummoner.java @@ -28,7 +28,7 @@ public class KitUndeadSummoner extends KitCastleSiege click(false, "your eggs to spawn undead mobs to help you fight") }; - private static final String REDUCE_COOLDOWN = reduceCooldown("Undead Potions", 2); + private static final String REDUCE_COOLDOWN = reduceCooldown("Undead Eggs", 2); private static final MobPotion SILVER_FISH = new MobPotion( new ItemBuilder(Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.SLIME)) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/perks/PerkMobPotions.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/perks/PerkMobPotions.java index b5a3aee33..1a2487473 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/perks/PerkMobPotions.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/perks/PerkMobPotions.java @@ -10,6 +10,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.Slime; import org.bukkit.event.EventHandler; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.player.PlayerInteractEvent; @@ -18,7 +19,6 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; -import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilTime; import mineplex.core.recharge.Recharge; @@ -44,7 +44,7 @@ public class PerkMobPotions extends Perk public PerkMobPotions(long cooldown, MobPotion... mobPotions) { - super("Mob Potions"); + super("Mob Egg"); _cooldown = cooldown; _mobPotions = mobPotions; @@ -89,7 +89,7 @@ public class PerkMobPotions extends Perk event.setCancelled(true); - if (!Recharge.Instance.use(player, GetName(), COOLDOWN, false, false) || !Recharge.Instance.use(player, ChatColor.stripColor(clickedPotion.getItemStack().getItemMeta().getDisplayName()), _cooldown, true, true)) + if (!Recharge.Instance.use(player, GetName(), COOLDOWN, true, false) || !Recharge.Instance.use(player, ChatColor.stripColor(clickedPotion.getItemStack().getItemMeta().getDisplayName()), _cooldown, true, true)) { return; } @@ -207,6 +207,29 @@ public class PerkMobPotions extends Perk } } + @EventHandler + public void updateDamage(UpdateEvent event) + { + if (event.getType() != UpdateType.FAST) + { + return; + } + + for (SummonedEntity entity : _entities) + { + // Slimes are weird and don't damage players normally. + if (entity.Summoned instanceof Slime) + { + LivingEntity target = entity.Summoned; + + for (Player player : UtilPlayer.getNearby(target.getLocation(), 2)) + { + Manager.GetDamage().NewDamageEvent(player, entity.Owner, null, DamageCause.CUSTOM, 2, true, true, false, entity.Summoned.getCustomName(), "Minion"); + } + } + } + } + public MobPotion[] getMobPotions() { return _mobPotions; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java index dbaa00bfd..bcd7e865c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java @@ -253,6 +253,7 @@ public class ProgressingKitManager implements Listener if (!game.InProgress() || !(kit instanceof ProgressingKit)) { + player.sendMessage("No in progress"); return; } @@ -277,6 +278,7 @@ public class ProgressingKitManager implements Listener if (game.SplitKitXP || dataList == null) { + player.sendMessage("Adding data"); addData(player, game, (ProgressingKit) kit); } } @@ -323,6 +325,7 @@ public class ProgressingKitManager implements Listener if (dataList == null || xpGained == null) { + player.sendMessage("dataList=" + (dataList == null) + " xpGained=" + (xpGained == null)); return; }