Changes to SnD

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/KitManager.java

@@ -92,7 +92,7 @@ public class KitManager
 
         }
 
-        { // Register rogue kits
+   /*     { // Register rogue kits
             ArrayList<UpgradeKit> children1 = new ArrayList<UpgradeKit>();
             ArrayList<UpgradeKit> children2 = new ArrayList<UpgradeKit>();
             ArrayList<UpgradeKit> children3 = new ArrayList<UpgradeKit>();
@@ -118,7 +118,7 @@ public class KitManager
             children3.add(rogue6);
             children3.add(rogue7);
 
-        }
+        }*/
 
     }
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/SearchAndDestroy.java

@@ -121,13 +121,15 @@ public class SearchAndDestroy extends TeamGame
 
     public boolean canEvolve(Player player)
     {
-        return _kills.containsKey(player.getName()) && _kills.get(player.getName()) >= 2
+        return (!_evolves.containsKey(player.getName()) || _evolves.get(player.getName()) < 2);// &&
-                && (!_evolves.containsKey(player.getName()) || _evolves.get(player.getName()) < 2);
+                                                                                               // _kills.containsKey(player.getName())
+                                                                                               // && _kills.get(player.getName())
+                                                                                               // >= 1;
     }
 
     public void onEvolve(Player player)
     {
-        _kills.put(player.getName(), _kills.get(player.getName()) - 2);
+        // _kills.put(player.getName(), _kills.get(player.getName()) - 1);
         _evolves.put(player.getName(), (_evolves.containsKey(player.getName()) ? _evolves.get(player.getName()) : 0) + 1);
     }
 
@@ -253,7 +255,7 @@ public class SearchAndDestroy extends TeamGame
                                                             ex.printStackTrace();
                                                         }
                                                     }
-                                                }, 2);
+                                                }, 4);
                                     }
                                 }
                             }
@@ -271,7 +273,7 @@ public class SearchAndDestroy extends TeamGame
     @EventHandler
     public void onGameState(GameStateChangeEvent event)
     {
-        if (event.GetState() == GameState.Dead || event.GetState() == GameState.Live || event.GetState() == GameState.Prepare)
+        if (event.GetState() == GameState.End || event.GetState() == GameState.Live || event.GetState() == GameState.Prepare)
         {
             drawScoreboard();
         }
@@ -340,6 +342,7 @@ public class SearchAndDestroy extends TeamGame
     {
         GetScoreboard().Reset();
 
+        GetScoreboard().WriteBlank();
         ArrayList<GameTeam> aliveTeams = new ArrayList<GameTeam>();
         for (GameTeam team : GetTeamList())
         {
@@ -375,7 +378,7 @@ public class SearchAndDestroy extends TeamGame
             }
             else
             {
-                GetScoreboard().Write(C.cYellow + "Bombs are safe");
+                GetScoreboard().Write("Bombs Safe");
             }
 
             if (itel.hasNext())
@@ -399,12 +402,6 @@ public class SearchAndDestroy extends TeamGame
         drawScoreboard();
     }
 
-    @EventHandler
-    public void onChat(PlayerChatEvent event)
-    {
-        _kills.put(event.getPlayer().getName(), Integer.parseInt(event.getMessage()));
-    }
-
     @EventHandler
     public void onGameEnd(GameStateChangeEvent event)
     {

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/TeamBomb.java

@@ -7,6 +7,7 @@ import java.util.Random;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilEnt;
+import mineplex.core.common.util.UtilTextMiddle;
 import mineplex.core.hologram.Hologram;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.game.GameTeam;
@@ -119,7 +120,7 @@ class TeamBomb implements Comparable<TeamBomb>
             ((CraftWorld) getBlockLocation().getWorld()).getHandle().addEntity(entity, SpawnReason.CUSTOM);
             _bombEntity = (TNTPrimed) entity.getBukkitEntity();
             _timeUntilExplode = 60;
-            Bukkit.broadcastMessage(ChatColor.GOLD + "" + ChatColor.MAGIC + "ab " + gameTeam.GetColor() + gameTeam.GetName()
+            UtilTextMiddle.display("", ChatColor.GOLD + "" + ChatColor.MAGIC + "ab " + gameTeam.GetColor() + gameTeam.GetName()
                     + " Team" + ChatColor.RESET + ChatColor.GOLD + " just armed " + getTeam().GetColor() + getTeam().GetName()
                     + " Team's" + ChatColor.RESET + ChatColor.GOLD + " bomb! " + ChatColor.MAGIC + "ab");
             for (Player player : Bukkit.getOnlinePlayers())
@@ -138,8 +139,8 @@ class TeamBomb implements Comparable<TeamBomb>
         }
         else
         {
-            Bukkit.broadcastMessage(_owningTeam.GetColor() + _owningTeam.GetName() + " Team" + ChatColor.RESET + ChatColor.GOLD
+            UtilTextMiddle.display("", _owningTeam.GetColor() + _owningTeam.GetName() + " Team" + ChatColor.RESET
-                    + " have just defused their bomb!");
+                    + ChatColor.GOLD + " have just defused their bomb!");
             restoreBomb();
         }
         _armers.clear();

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitBow.java

@@ -36,6 +36,7 @@ public class KitBow extends KitHuman
             });
         
         inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitPinner.java

@@ -39,6 +39,7 @@ public class KitPinner extends KitHuman
                     new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
             });
         inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitPunch.java

@@ -48,6 +48,7 @@ public class KitPunch extends KitHuman
                     new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
             });
         inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitQuickshooter.java

@@ -35,7 +35,8 @@ public class KitQuickshooter extends KitHuman
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot")
                 .setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitSharpshooter.java

@@ -41,6 +41,7 @@ public class KitSharpshooter extends KitHuman
                     new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
             });
         inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitSniper.java

@@ -50,6 +50,7 @@ public class KitSniper extends KitHuman
                     new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_HELMET)
             });
         inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/bow/KitThunderstorm.java

@@ -37,6 +37,7 @@ public class KitThunderstorm extends KitHuman
     {
         PlayerInventory inv = player.getInventory();
         inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.WOOD_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.BOW).setTitle(C.cGreen + "Left-Click" + C.cWhite + " - " + C.cYellow + "Quickshot")
                 .setUnbreakable(true).addEnchantment(Enchantment.ARROW_INFINITE, 1).build());
         inv.setArmorContents(new ItemStack[]

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitEvade.java

@@ -35,7 +35,7 @@ public class KitEvade extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitFlash.java

@@ -35,7 +35,7 @@ public class KitFlash extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitMultiFlash.java

@@ -35,7 +35,7 @@ public class KitMultiFlash extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitPhaseBlast.java

@@ -35,7 +35,7 @@ public class KitPhaseBlast extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Flash").setUnbreakable(true).build());
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitRewind.java

@@ -38,7 +38,7 @@ public class KitRewind extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.NETHER_STAR)

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitRogue.java

@@ -36,7 +36,7 @@ public class KitRogue extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
         inv.setItem(9, new ItemStack(Material.ARROW, 1));
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/rogue/KitWraith.java

@@ -35,7 +35,7 @@ public class KitWraith extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Evade").setUnbreakable(true).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitAssault.java

@@ -12,6 +12,7 @@ import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.kit.Kit;
 import nautilus.game.arcade.kit.KitAvailability;
 import nautilus.game.arcade.kit.Perk;
+import nautilus.game.arcade.kit.perks.PerkBullsCharge;
 
 public class KitAssault extends Kit
 {
@@ -22,7 +23,10 @@ public class KitAssault extends Kit
             {
                     "Bulls Charge ability.", "Temperary speed boost when activated.", "When attacking with the boost on",
                     "The victim is stunned and slows down"
-            }, new Perk[0], EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
+            }, new Perk[]
+            {
+                new PerkBullsCharge()
+            }, EntityType.ZOMBIE, new ItemStack(Material.IRON_SWORD));
     }
 
     @Override
@@ -35,7 +39,7 @@ public class KitAssault extends Kit
                     new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
             });
 
-        inv.addItem(new ItemStack(Material.IRON_SWORD));
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());
     }

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitBeserker.java

@@ -35,7 +35,7 @@ public class KitBeserker extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Takedown").setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitBreaker.java

@@ -33,7 +33,7 @@ public class KitBreaker extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Takedown").setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitChampion.java

@@ -34,7 +34,7 @@ public class KitChampion extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Bulls Charge").setUnbreakable(true).build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitJuggernaut.java

@@ -35,7 +35,7 @@ public class KitJuggernaut extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Seismic Slam").setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitTank.java

@@ -34,7 +34,7 @@ public class KitTank extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD).setTitle(C.cGray + "No Ability").setUnbreakable(true).build());
         inv.addItem(new ItemBuilder(Material.IRON_AXE)
                 .setTitle(C.cGreen + "Right-Click" + C.cWhite + " - " + C.cYellow + "Harden").setUnbreakable(true).build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitTitan.java

@@ -34,7 +34,7 @@ public class KitTitan extends Kit
     public void GiveItems(Player player)
     {
         PlayerInventory inv = player.getInventory();
-        inv.setItem(4, new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
         inv.addItem(new ItemBuilder(Material.IRON_SWORD)
                 .setTitle(C.cGreen + "Hold Block" + C.cWhite + " - " + C.cYellow + "Defensive Stance").setUnbreakable(true)
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/searchanddestroy/kits/trooper/KitTrooper.java

@@ -34,7 +34,8 @@ public class KitTrooper extends Kit
                     new ItemStack(Material.IRON_CHESTPLATE), new ItemStack(Material.IRON_HELMET)
             });
 
-        inv.addItem(new ItemStack(Material.IRON_SWORD));
+        inv.addItem(new ItemBuilder(Material.BLAZE_POWDER).setTitle(ChatColor.GOLD + "Fuse").build());
+        inv.addItem(new ItemBuilder(Material.IRON_SWORD).setUnbreakable(true).build());
         inv.addItem(new ItemStack(Material.GOLDEN_APPLE, 2));
         inv.setItem(8, new ItemBuilder(Material.BOOK).setTitle(ChatColor.WHITE + "Evolve Kit Menu").addLore("Right click to use")
                 .build());

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDefensiveStance.java

@@ -64,7 +64,7 @@ public class PerkDefensiveStance extends Perk
 		if (damagee == null)	
 			return;
 
-		if (_useTime.containsKey(damagee))
+		if (!_useTime.containsKey(damagee))
 			return;
 		
 		if (!UtilTime.elapsed(_useTime.get(damagee), 500))