From 4149d4e7336036baf2d167992e7d8d4e502c1dd9 Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Fri, 5 Nov 2010 04:55:25 +0000
Subject: [PATCH] - fixed the player's health and mana bars monitoring the
 wrong unit whenever the player leaves an instance while in a vehicle

---
 modules/PlayerHealth.lua | 9 +++++++++
 modules/PlayerMana.lua   | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/PlayerHealth.lua b/modules/PlayerHealth.lua
index dea1b25..ac1a975 100644
--- a/modules/PlayerHealth.lua
+++ b/modules/PlayerHealth.lua
@@ -908,6 +908,7 @@ end
 
 
 function PlayerHealth.prototype:EnteringWorld()
+	self:CheckVehicle()
 	self:CheckCombat()
 	self:CheckLeader()
 	self:CheckPartyRole()
@@ -916,6 +917,14 @@ function PlayerHealth.prototype:EnteringWorld()
 	self:Resting()
 end
 
+function PlayerHealth.prototype:CheckVehicle()
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
+	end
+end
+
 
 function PlayerHealth.prototype:Resting()
 	self.resting = IsResting()
diff --git a/modules/PlayerMana.lua b/modules/PlayerMana.lua
index 477f498..271de1b 100644
--- a/modules/PlayerMana.lua
+++ b/modules/PlayerMana.lua
@@ -120,6 +120,7 @@ function PlayerMana.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
 	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+	self:RegisterEvent("PLAYER_ENTERING_WORLD", "CheckVehicle")
 
 	if not self.CustomOnUpdate then
 		self.CustomOnUpdate = function() self:Update(self.unit) end
@@ -135,6 +136,14 @@ function PlayerMana.prototype:Enable(core)
 	self:ManaType(nil, self.unit)
 end
 
+function PlayerMana.prototype:CheckVehicle()
+	if UnitHasVehicleUI("player") then
+		self:EnteringVehicle(nil, "player", true)
+	else
+		self:ExitingVehicle(nil, "player")
+	end
+end
+
 function PlayerMana.prototype:ShouldUseTicker()
 	return IceHUD.WowVer < 30000 or not GetCVarBool("predictedPower")
 end