From d802cd3811c77a1b0bef95a65fdfc4872ff557a8 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 29 Aug 2009 23:20:16 -0500
Subject: *More update about positions. *Ulduar: do not allow demolisher to
 regenerate pyrite. Player must shoot down and grab the containers to refill
 pyrite.

--HG--
branch : trunk
---
 src/game/Creature.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/game/Creature.cpp')

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 40507387226..47515638490 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -556,7 +556,10 @@ void Creature::Update(uint32 diff)
                     RegenerateHealth();
 
                 if(getPowerType() == POWER_ENERGY)
-                    Regenerate(POWER_ENERGY);
+                {
+                    if(!IsVehicle() || GetVehicleKit()->GetVehicleInfo()->m_powerType != POWER_PYRITE)
+                        Regenerate(POWER_ENERGY);
+                }
                 else
                     RegenerateMana();
 
@@ -1834,11 +1837,7 @@ bool Creature::FallGround()
     if (fabs(ground_Z - z) < 0.1f)
         return false;
 
-    SetFlying(false);
-    RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-    SendMovementFlagUpdate();
-    //AddUnitMovementFlag(MOVEMENTFLAG_FALLING);
-    GetMotionMaster()->MovePoint(EVENT_FALL_GROUND, x, y, ground_Z);
+    GetMotionMaster()->MoveFall(ground_Z, EVENT_FALL_GROUND);
     Unit::setDeathState(DEAD_FALLING);
     return true;
 }
-- 
cgit v1.2.3