From 4e9333e823d359bad8542d1318f35db0fd32e925 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Fri, 17 Feb 2012 17:21:54 -0500
Subject: [PATCH] Added option to disable Herbalism hunger bonuses

---
 .../gmail/nossr50/config/LoadProperties.java  |  3 +-
 .../nossr50/listeners/mcEntityListener.java   | 65 ++++++++++---------
 src/main/resources/config.yml                 |  1 +
 3 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/config/LoadProperties.java b/src/main/java/com/gmail/nossr50/config/LoadProperties.java
index 7fd941164..e0fdff377 100644
--- a/src/main/java/com/gmail/nossr50/config/LoadProperties.java
+++ b/src/main/java/com/gmail/nossr50/config/LoadProperties.java
@@ -43,7 +43,7 @@ public class LoadProperties {
 			diamondArmor, woodenTools, stoneTools, ironTools, goldTools,
 			diamondTools, enderPearl, blazeRod, records, glowstoneDust,
 			fishingDiamonds, aDisplayNames, pDisplayNames, enableSmoothToMossy,
-			enableDirtToGrass, statsTracking, eventCallback;
+			enableDirtToGrass, statsTracking, eventCallback, herbalismHungerBonus;
 
 	public static String MySQLtablePrefix, MySQLuserName,
 			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
@@ -248,6 +248,7 @@ public class LoadProperties {
 		mnetherwart = readInteger("Experience.Herbalism.Nether_Wart", 50);
 		mlilypad = readInteger("Experience.Herbalism.Lily_Pads", 100);
 		mvines = readInteger("Experience.Herbalism.Vines", 10);
+		herbalismHungerBonus = readBoolean("Skills.Herbalism.Hunger_Bonus", true);
 
 		mpine = readInteger("Experience.Woodcutting.Pine", 70);
 		mbirch = readInteger("Experience.Woodcutting.Birch", 80);
diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
index 727313ecd..32e430199 100644
--- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
@@ -243,40 +243,43 @@ public class mcEntityListener implements Listener
 	@EventHandler (priority = EventPriority.LOW)
 	public void onFoodLevelChange(FoodLevelChangeEvent event)
 	{
-		if(event.getEntity() instanceof Player)
+		if(LoadProperties.herbalismHungerBonus)
 		{
-			Player player = (Player) event.getEntity();
-			PlayerProfile PP = Users.getProfile(player);
-			int currentFoodLevel = player.getFoodLevel();
-			int newFoodLevel = event.getFoodLevel();
-			
-			if(newFoodLevel > currentFoodLevel)
+			if(event.getEntity() instanceof Player)
 			{
-				int food = player.getItemInHand().getTypeId();
-
-				if(food == 297 || food == 357 || food == 360 || food == 282)
+				Player player = (Player) event.getEntity();
+				PlayerProfile PP = Users.getProfile(player);
+				int currentFoodLevel = player.getFoodLevel();
+				int newFoodLevel = event.getFoodLevel();
+				
+				if(newFoodLevel > currentFoodLevel)
 				{
-					int foodChange = newFoodLevel - currentFoodLevel;
-					int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
-					
-					if(herbLevel < 200)
-						foodChange = foodChange + 1;
-					if(herbLevel >= 200 && herbLevel < 400)
-						foodChange = foodChange + 2;
-					if(herbLevel >= 400 && herbLevel < 600)
-						foodChange = foodChange + 3;
-					if(herbLevel >= 600 && herbLevel < 800)
-						foodChange = foodChange + 4;
-					if(herbLevel >= 800 && herbLevel < 1000)
-						foodChange = foodChange + 5;
-					if(herbLevel >= 1000)
-						foodChange = foodChange + 6;
-					
-					newFoodLevel = currentFoodLevel + foodChange;
-					if(newFoodLevel > 20)
-						event.setFoodLevel(20);
-					if(newFoodLevel <= 20)
-						event.setFoodLevel(newFoodLevel);
+					int food = player.getItemInHand().getTypeId();
+	
+					if(food == 297 || food == 357 || food == 360 || food == 282)
+					{
+						int foodChange = newFoodLevel - currentFoodLevel;
+						int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
+						
+						if(herbLevel < 200)
+							foodChange = foodChange + 1;
+						if(herbLevel >= 200 && herbLevel < 400)
+							foodChange = foodChange + 2;
+						if(herbLevel >= 400 && herbLevel < 600)
+							foodChange = foodChange + 3;
+						if(herbLevel >= 600 && herbLevel < 800)
+							foodChange = foodChange + 4;
+						if(herbLevel >= 800 && herbLevel < 1000)
+							foodChange = foodChange + 5;
+						if(herbLevel >= 1000)
+							foodChange = foodChange + 6;
+						
+						newFoodLevel = currentFoodLevel + foodChange;
+						if(newFoodLevel > 20)
+							event.setFoodLevel(20);
+						if(newFoodLevel <= 20)
+							event.setFoodLevel(newFoodLevel);
+					}
 				}
 			}
 		}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 1cb6de2b2..73a6bce00 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -121,6 +121,7 @@ Skills:
             Cobble_To_Mossy: true
             SmoothBrick_To_MossyBrick: true
             Dirt_To_Grass: true
+        Hunger_Bonus: true
     Mining:
         Level_Cap: 0
         Requires_Pickaxe: true