Fix accessories for vehicle player mounts (the vendors on Traveler's Tundra Mammoth for example)

--HG--
branch : trunk

1 files changed, 5 insertions, 0 deletions

diff --git a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
index 008853064cd..f147b26e376 100644
--- a/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
@@ -659,6 +659,11 @@ void WorldSession::HandleEjectPasenger(WorldPacket &data)
             data >> guid;
             if (Player* Pl=ObjectAccessor::FindPlayer(guid))
                 Pl->ExitVehicle();
+            else if (Unit* Un = ObjectAccessor::GetUnit(*_player, guid)) // creatures can be ejected too from player mounts
+            {
+                Un->ExitVehicle();
+                Un->ToCreature()->ForcedDespawn(1000);
+            }
         }
     }
 }