From cc09bf6b51ab1f6c4adf10c31a2519c7205b422e Mon Sep 17 00:00:00 2001
From: phobia <phobia@gitlab.com>
Date: Sat, 2 Apr 2016 21:43:33 +1100
Subject: [PATCH] Fixes to Bull Charge + Adding more instructins to purchasing

---
 .../clans/objective/PurchaseItemsObjective.java        | 10 +++++-----
 .../objective/goals/classes/UseBullsChargeGoal.java    |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java
index 18c5e5d2b..34e7cfbac 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java
@@ -26,17 +26,17 @@ public class PurchaseItemsObjective extends UnorderedObjective<ClansMainTutorial
 				this,
 				Material.IRON_HELMET,
 				"Purchase Iron Helmet",
-				"Buy an Iron Helmet",
+				"Buy an Iron Helmet from the PvP Gear NPC",
 				"The shops sell everything you could ever need and more."
 		));
-		addGoal(new PurchaseGoal(this, Material.IRON_CHESTPLATE, "Purchase Iron Chestplate",
+		addGoal(new PurchaseGoal(this, Material.IRON_CHESTPLATE, "Purchase Iron Chestplate from the PvP Gear NPC",
 				"Buy an Iron Chestplate"));
 		addGoal(new PurchaseGoal(this, Material.IRON_LEGGINGS, "Purchase Iron Leggings",
-				"Buy Iron Leggings"));
+				"Buy Iron Leggings from the PvP Gear NPC"));
 		addGoal(new PurchaseGoal(this, Material.IRON_BOOTS, "Purchase Iron Boots",
-				"Buy Iron Boots"));
+				"Buy Iron Boots from the PvP Gear NPC"));
 		addGoal(new PurchaseGoal(this, Material.IRON_AXE, "Purchase Iron Axe",
-				"Buy an Iron Axe"));
+				"Buy an Iron Axe from the PvP Gear NPC"));
 //		addGoal(new PurchaseGoal(this, Material.IRON_PICKAXE, "Purchase Iron Pickaxe", "Talk to the Pvp Gear NPC and purchase an Iron Pickaxe"));
 
 		setStartMessageDelay(60);
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java
index 99cafa74b..d95287c5a 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java
@@ -43,7 +43,6 @@ public class UseBullsChargeGoal extends ObjectiveGoal<ClassesObjective> {
 	@EventHandler
 	public void checkSkill(SkillTriggerEvent event) {
 		if (contains(event.GetPlayer())) {
-			if (event.GetSkillName().toLowerCase().contains("bulls charge"))
 				finish(event.GetPlayer());
 		}
 	}