From e90caf734939a2e399ba696beb38ab48e8ff5bd7 Mon Sep 17 00:00:00 2001
From: Reamer <philipp.dallig@web.de>
Date: Thu, 23 Aug 2012 13:01:29 +0200
Subject: [PATCH] [12111] Add Unit::KnockBackWithAngle function

Also wrap up the packet sending for a knockbacked player to WorldSession::SendKnockBack

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
---
 src/game/MovementHandler.cpp | 15 +++++++++++++++
 src/game/Unit.cpp            | 17 +++++++----------
 src/game/Unit.h              |  1 +
 src/game/WorldSession.h      |  1 +
 src/shared/revision_nr.h     |  2 +-
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index ea383b699..91efb87b5 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -447,6 +447,21 @@ void WorldSession::HandleMoveKnockBackAck(WorldPacket& recv_data)
     mover->SendMessageToSetExcept(&data, _player);
 }
 
+void WorldSession::SendKnockBack(float angle, float horizontalSpeed, float verticalSpeed)
+{
+    float vsin = sin(angle);
+    float vcos = cos(angle);
+
+    WorldPacket data(SMSG_MOVE_KNOCK_BACK, 9 + 4 + 4 + 4 + 4 + 4);
+    data << GetPlayer()->GetPackGUID();
+    data << uint32(0);                                  // Sequence
+    data << float(vcos);                                // x direction
+    data << float(vsin);                                // y direction
+    data << float(horizontalSpeed);                     // Horizontal speed
+    data << float(-verticalSpeed);                      // Z Movement speed (vertical)
+    SendPacket(&data);
+}
+
 void WorldSession::HandleMoveHoverAck(WorldPacket& recv_data)
 {
     DEBUG_LOG("CMSG_MOVE_HOVER_ACK");
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 47b859643..3bd452d55 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11235,22 +11235,19 @@ void Unit::SetFFAPvP(bool state)
 void Unit::KnockBackFrom(Unit* target, float horizontalSpeed, float verticalSpeed)
 {
     float angle = this == target ? GetOrientation() + M_PI_F : target->GetAngle(this);
-    float vsin = sin(angle);
-    float vcos = cos(angle);
+    KnockBackWithAngle(angle, horizontalSpeed, verticalSpeed);
+}
 
+void Unit::KnockBackWithAngle(float angle, float horizontalSpeed, float verticalSpeed)
+{
     if (GetTypeId() == TYPEID_PLAYER)
     {
-        WorldPacket data(SMSG_MOVE_KNOCK_BACK, 9 + 4 + 4 + 4 + 4 + 4);
-        data << GetPackGUID();
-        data << uint32(0);                                  // Sequence
-        data << float(vcos);                                // x direction
-        data << float(vsin);                                // y direction
-        data << float(horizontalSpeed);                     // Horizontal speed
-        data << float(-verticalSpeed);                      // Z Movement speed (vertical)
-        ((Player*)this)->GetSession()->SendPacket(&data);
+        ((Player*)this)->GetSession()->SendKnockBack(angle, horizontalSpeed, verticalSpeed);
     }
     else
     {
+        float vsin = sin(angle);
+        float vcos = cos(angle);
         float moveTimeHalf = verticalSpeed / Movement::gravity;
         float max_height = -Movement::computeFallElevation(moveTimeHalf, false, -verticalSpeed);
 
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 9ac2609a4..0a92dcc6e 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1892,6 +1892,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void SetSpeedRate(UnitMoveType mtype, float rate, bool forced = false);
 
         void KnockBackFrom(Unit* target, float horizontalSpeed, float verticalSpeed);
+        void KnockBackWithAngle(float angle, float horizontalSpeed, float verticalSpeed);
 
         void _RemoveAllAuraMods();
         void _ApplyAllAuraMods();
diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h
index baf847fca..042ff86ae 100644
--- a/src/game/WorldSession.h
+++ b/src/game/WorldSession.h
@@ -442,6 +442,7 @@ class MANGOS_DLL_SPEC WorldSession
 
         // Knockback
         void HandleMoveKnockBackAck(WorldPacket& recvPacket);
+        void SendKnockBack(float angle, float horizontalSpeed, float verticalSpeed);
 
         void HandleMoveTeleportAckOpcode(WorldPacket& recvPacket);
         void HandleForceSpeedChangeAckOpcodes(WorldPacket& recv_data);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2f2a19daf..4691ed209 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12110"
+ #define REVISION_NR "12111"
 #endif // __REVISION_NR_H__