From a51fe8e06ff2a39cbbacaf0272062be4db8f382c Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Thu, 21 Oct 2010 02:49:59 +0000
Subject: [PATCH] - changed the pet health/mana bars to monitor the player
 whenever the player enters a vehicle since the player bars already change to
 display vehicle info in that situation

---
 modules/PetHealth.lua | 20 ++++++++++++++++++
 modules/PetMana.lua   | 48 +++++++++++++++++++++----------------------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/modules/PetHealth.lua b/modules/PetHealth.lua
index 30ea71a..14f64dc 100644
--- a/modules/PetHealth.lua
+++ b/modules/PetHealth.lua
@@ -60,6 +60,9 @@ function PetHealth.prototype:Enable(core)
 		self:RegisterEvent("UNIT_HAPPINESS", "PetHappiness")
 	end
 
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+
 	self.frame:SetAttribute("unit", self.unit)
 	RegisterUnitWatch(self.frame)
 
@@ -223,5 +226,22 @@ function PetHealth.prototype:EnableClickTargeting(bEnable)
 	end
 end
 
+function PetHealth.prototype:EnteringVehicle(event, unit, arg2)
+	if (self.unit == "pet" and IceHUD:ShouldSwapToVehicle(unit, arg2)) then
+		self.unit = "player"
+		self:RegisterFontStrings()
+		self:Update(self.unit)
+	end
+end
+
+
+function PetHealth.prototype:ExitingVehicle(event, unit)
+	if (unit == "player" and self.unit == "player") then
+		self.unit = "pet"
+		self:RegisterFontStrings()
+		self:Update(self.unit)
+	end
+end
+
 -- Load us up
 IceHUD.PetHealth = PetHealth:new()
diff --git a/modules/PetMana.lua b/modules/PetMana.lua
index b3715fc..f5ec678 100644
--- a/modules/PetMana.lua
+++ b/modules/PetMana.lua
@@ -50,11 +50,10 @@ end
 function PetMana.prototype:Enable(core)
 	PetMana.super.prototype.Enable(self, core)
 
-	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet");
-	self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet");
-	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet");
-	self:RegisterEvent("UNIT_PET", "CheckPet");
-	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "CheckPet")
+	self:RegisterEvent("PET_UI_UPDATE",	 "CheckPet")
+	self:RegisterEvent("PLAYER_PET_CHANGED", "CheckPet")
+	self:RegisterEvent("PET_BAR_CHANGED", "CheckPet")
+	self:RegisterEvent("UNIT_PET", "CheckPet")
 
 	if IceHUD.WowVer >= 40000 then
 		self:RegisterEvent("UNIT_POWER", "UpdateEvent")
@@ -72,14 +71,15 @@ function PetMana.prototype:Enable(core)
 
 	self:RegisterEvent("UNIT_DISPLAYPOWER", "ManaType")
 
+	self:RegisterEvent("UNIT_ENTERED_VEHICLE", "EnteringVehicle")
+	self:RegisterEvent("UNIT_EXITED_VEHICLE", "ExitingVehicle")
+
 	self:CheckPet()
 	self:ManaType(nil, self.unit)
 end
 
 
 function PetMana.prototype:CheckPet()
-	self:CheckForVehicle()
-
 	if (UnitExists(self.unit)) then
 		self:Show(true)
 		self:ManaType(nil, self.unit)
@@ -123,28 +123,11 @@ function PetMana.prototype:MyOnUpdate()
 end
 
 
-function PetMana.prototype:CheckForVehicle()
-	local lastUnit = self.unit
-
-	if UnitIsUnit("pet", "vehicle") or UnitHasVehicleUI("player") then
-		self.unit = "vehicle"
-	else
-		self.unit = "pet"
-	end
-
-	if self.unit ~= lastUnit then
-		self:ManaType(nil, self.unit)
-	end
-end
-
-
 function PetMana.prototype:UpdateEvent(event, unit)
 	self:Update(unit)
 end
 
 function PetMana.prototype:Update(unit)
-	self:CheckForVehicle()
-
 	PetMana.super.prototype.Update(self)
 
 	if (unit and (unit ~= self.unit)) then
@@ -215,7 +198,24 @@ function PetMana.prototype:GetOptions()
 	return opts
 end
 
+function PetMana.prototype:EnteringVehicle(event, unit, arg2)
+	if (self.unit == "pet" and IceHUD:ShouldSwapToVehicle(unit, arg2)) then
+		self.unit = "player"
+		self:RegisterFontStrings()
+		self:ManaType(nil, self.unit)
+		self:Update(self.unit)
+	end
+end
 
 
+function PetMana.prototype:ExitingVehicle(event, unit)
+	if (unit == "player" and self.unit == "player") then
+		self.unit = "pet"
+		self:RegisterFontStrings()
+		self:ManaType(nil, self.unit)
+		self:Update(self.unit)
+	end
+end
+
 -- Load us up
 IceHUD.PetMana = PetMana:new()