From f8f87a23bc9f8f9578ef1c7446594a098d056cb1 Mon Sep 17 00:00:00 2001
From: AlexTheCoder <alexjmeech@gmail.com>
Date: Sat, 15 Jul 2017 15:52:13 -0400
Subject: [PATCH] Fix bug causing tnt to not function, increase tnt damage,
 remove fire resistance from loot pool, and implement Alchemist kit

---
 .../arcade/game/games/castleassault/CastleAssault.java | 10 +++++-----
 .../game/games/castleassault/CastleAssaultTDM.java     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
index 9d651ad84..f0bc1402d 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssault.java
@@ -56,7 +56,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Dispenser;
 import org.bukkit.material.MaterialData;
 import org.bukkit.metadata.FixedMetadataValue;
-import org.bukkit.metadata.MetadataValue;
 import org.bukkit.util.Vector;
 
 import mineplex.core.Managers;
@@ -97,6 +96,7 @@ import nautilus.game.arcade.game.games.castleassault.data.KillStreakData;
 import nautilus.game.arcade.game.games.castleassault.data.ObjectiveTNTSpawner;
 import nautilus.game.arcade.game.games.castleassault.data.TeamCrystal;
 import nautilus.game.arcade.game.games.castleassault.data.TeamKing;
+import nautilus.game.arcade.game.games.castleassault.kits.KitAlchemist;
 import nautilus.game.arcade.game.games.castleassault.kits.KitArcher;
 import nautilus.game.arcade.game.games.castleassault.kits.KitDemolitionist;
 import nautilus.game.arcade.game.games.castleassault.kits.KitFighter;
@@ -143,7 +143,7 @@ public class CastleAssault extends TeamGame
 		super(manager, GameType.CastleAssault,
 			new Kit[]
 			{
-				//new KitAlchemist(manager),
+				new KitAlchemist(manager),
 				new KitArcher(manager),
 				new KitDemolitionist(manager),
 				//new KitEnchanter(manager),
@@ -246,7 +246,6 @@ public class CastleAssault extends TeamGame
 		}
 		{
 			_potionGearRare.addLoot(new ItemBuilder(Material.POTION).setData((short)8193).build(), 2);
-			_potionGearRare.addLoot(new ItemBuilder(Material.POTION).setData((short)8195).build(), 2);
 		}
 		{
 			_miscGear.addLoot(new ItemStack(Material.ENDER_PEARL), 2);
@@ -956,7 +955,8 @@ public class CastleAssault extends TeamGame
 		float radius = event.getRadius();
 		event.setRadius(0f);
 		
-		Player player = UtilPlayer.searchExact(((MetadataValue)UtilEnt.GetMetadata(event.getEntity(), "THROWER")).asString());
+		String thrower = UtilEnt.GetMetadata(event.getEntity(), "THROWER");
+		Player player = UtilPlayer.searchExact(thrower);
 		if (player == null)
 		{
 			return;
@@ -1003,7 +1003,7 @@ public class CastleAssault extends TeamGame
 			}
 			blastProtEPF = Math.min(blastProtEPF, 20);
 			
-			double damage = 8 * mult;
+			double damage = 10 * mult;
 			damage = damage * (1 - (blastProtEPF / 25));
 			
 			double knockbackReduction = 1 - (highestBlastProt * 0.15);
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java
index 959288efe..e1401ca49 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castleassault/CastleAssaultTDM.java
@@ -46,7 +46,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Dispenser;
 import org.bukkit.material.MaterialData;
-import org.bukkit.metadata.MetadataValue;
 
 import mineplex.core.Managers;
 import mineplex.core.common.Pair;
@@ -807,7 +806,8 @@ public class CastleAssaultTDM extends TeamGame
 		float radius = event.getRadius();
 		event.setRadius(0f);
 		
-		Player player = UtilPlayer.searchExact(((MetadataValue)UtilEnt.GetMetadata(event.getEntity(), "THROWER")).asString());
+		String thrower = UtilEnt.GetMetadata(event.getEntity(), "THROWER");
+		Player player = UtilPlayer.searchExact(thrower);
 		if (player == null)
 		{
 			return;