From 6b1df231a581be5f6874e2b13c28d5595491fd4e Mon Sep 17 00:00:00 2001
From: LordJZ <a553r7fa1l3d@gmail.com>
Date: Sun, 12 Aug 2012 09:16:16 +0400
Subject: [PATCH] Forward-merge out of world SMSG_POWER_UPDATE and 4.x
 structure fixes.

---
 src/game/Unit.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c54b9dc2c..09c064757 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9874,11 +9874,15 @@ void Unit::SetPowerByIndex(uint32 powerIndex, int32 val)
 
     SetInt32Value(UNIT_FIELD_POWER1 + powerIndex, val);
 
-    WorldPacket data(SMSG_POWER_UPDATE);
-    data << GetPackGUID();
-    data << uint8(powerIndex);
-    data << uint32(val);
-    SendMessageToSet(&data, true);
+    if (IsInWorld())
+    {
+        WorldPacket data(SMSG_POWER_UPDATE);
+        data << GetPackGUID();
+        data << uint32(1); // iteration count
+        data << uint8(powerIndex);
+        data << uint32(val);
+        SendMessageToSet(&data, true);
+    }
 
     // group update
     if (GetTypeId() == TYPEID_PLAYER)