From 6a7df4d17c67f059b98092045f7d20624da68a5e Mon Sep 17 00:00:00 2001
From: Michael Townsend <Continuities@gmail.com>
Date: Thu, 4 Jul 2013 07:28:19 -0700
Subject: [PATCH] Fixed non-combat meat eating

---
 script/events.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/script/events.js b/script/events.js
index 77965ea..f8c5a65 100644
--- a/script/events.js
+++ b/script/events.js
@@ -171,20 +171,24 @@ var Events = {
 	},
 	
 	eatMeat: function() {
-		if(Events.activeEvent() && Path.outfit['cured meat'] > 0) {
+		if(Path.outfit['cured meat'] > 0) {
 			Path.outfit['cured meat']--;
 			World.updateSupplies();
 			if(Path.outfit['cured meat'] == 0) {
 				Button.setDisabled($('#eat'), true);
 			}
-			var w = $('#wanderer');
-			var hp = w.data('hp');
+			
+			var hp = World.health;
 			hp += World.meatHeal();
 			hp = hp > World.getMaxHealth() ? World.getMaxHealth() : hp;
-			w.data('hp', hp);
 			World.setHp(hp);
-			Events.updateFighterDiv(w);
-			Events.drawFloatText('+' + World.meatHeal(), '#wanderer .hp');
+			
+			if(Events.activeEvent()) {
+				var w = $('#wanderer');
+				w.data('hp', hp);
+				Events.updateFighterDiv(w);
+				Events.drawFloatText('+' + World.meatHeal(), '#wanderer .hp');
+			}
 		}
 	},