Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/GameObject: implement dismount on use of certain GOs

Browse Source 
- The fact of player dismounting was entirely client-sided, with no server code enforcing it.

Closes #19979

(cherry picked from commit 2ce3f3a7b8)
This commit is contained in:
ariel-
2017-12-16 05:00:35 -03:00
committed by funjoker
parent 044110d423
commit 0486ff8350
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -48,6 +48,47 @@
#include <G3D/Quat.h>
#include <sstream>
// dumped from client
std::vector<uint32> const GameObjectTemplate::_goTypeProperties[MAX_GAMEOBJECT_TYPE] =
{
{ 0x01, 0x04, 0x03, 0x39, 0x59, 0x5A, 0x75, 0x55 },
{ 0x01, 0x04, 0x03, 0x1E, 0x39, 0x30, 0x59, 0x5A, 0x37, 0x55 },
{ 0x04, 0x05, 0x11, 0x26, 0x16, 0x39, 0x59, 0x37, 0x5B, 0x30, 0x55 },
{ 0x04, 0x06, 0x07, 0x08, 0x19, 0x1A, 0x0D, 0x1E, 0x14, 0x1F, 0x37, 0x38, 0x3E, 0x42, 0x59, 0x5C, 0x13, 0x55 },
{ },
{ 0x13, 0x12, 0x25, 0x30, 0x3F, 0x14, 0x55 },
{ 0x04, 0x1F, 0x18, 0x0A, 0x09, 0x17, 0x03, 0x20, 0x25, 0x41, 0x30, 0x3A, 0x59, 0x5A, 0x7B, 0x55 },
{ 0x0B, 0x0C, 0x5E, 0x0D, 0x55 },
{ 0x0E, 0x18, 0x1E, 0x25, 0x14, 0x30, 0x13, 0x3F, 0x55 },
{ 0x0F, 0x10, 0x11, 0x5B, 0x55 },
{ 0x04, 0x14, 0x15, 0x03, 0x16, 0x08, 0x17, 0x0F, 0x10, 0x11, 0x0A, 0x39, 0x1E, 0x30, 0x59, 0x5A, 0x37, 0x5B, 0x13, 0x26, 0x7F, 0x3F, 0x55 },
{ 0x5D, 0x01, 0x03, 0x7D, 0x7E, 0x57 },
{ 0x04, 0x18, 0x1B, 0x1C, 0x1D, 0x03, 0x59, 0x5A },
{ 0x04, 0x21, 0x15, 0x59, 0x55 },
{ },
{ 0x23, 0x24, 0x2B, 0x2C, 0x2D, 0x63, 0x57, 0x43, 0x80 },
{ },
{ },
{ 0x22, 0x0A, 0x27, 0x28, 0x31, 0x32, 0x36, 0x2E, 0x55 },
{ 0x55 },
{ },
{ 0x2A, 0x09 },
{ 0x0A, 0x09, 0x2F, 0x5B, 0x30, 0x55 },
{ 0x33, 0x34, 0x35 },
{ 0x04, 0x3B, 0x18, 0x3C, 0x3D, 0x39, 0x59, 0x37, 0x55 },
{ 0x18, 0x06, 0x19, 0x1A, 0x04 },
{ 0x04, 0x15, 0x3B, 0x39, 0x59 },
{ 0x40 },
{ },
{ 0x18, 0x0A, 0x43, 0x44, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x45, 0x4F, 0x50, 0x51, 0x52, 0x30, 0x12, 0x76, 0x77 },
{ 0x01, 0x18, 0x53, 0x55, 0x54, 0x56, 0x25 },
{ 0x57, 0x58 },
{ 0x0C, 0x79 },
{ 0x5F, 0x61, 0x67, 0x6D, 0x67, 0x60, 0x67, 0x67, 0x67, 0x6E, 0x67, 0x67, 0x67, 0x67, 0x6F, 0x67, 0x70, 0x67, 0x7C, 0x72, 0x67, 0x67, 0x78, 0x67 },
{ 0x55 },
{ 0x5D, 0x01, 0x03 }
};
void GameObjectTemplate::InitializeQueryData()
{
WorldPacket queryTemp;
@@ -1470,6 +1511,9 @@ void GameObject::Use(Unit* user)
if (Player* playerUser = user->ToPlayer())
{
if (m_goInfo->DismountOnUse())
playerUser->Dismount();
playerUser->PlayerTalkClass->ClearMenus();
if (AI()->GossipHello(playerUser))
return;

28
src/server/game/Entities/GameObject/GameObjectData.h
View File

@@ -833,6 +833,20 @@ struct GameObjectTemplate
}
}
bool DismountOnUse() const
{
switch (type)
{
case GAMEOBJECT_TYPE_MAILBOX: return false;
case GAMEOBJECT_TYPE_BARBER_CHAIR: return true;
default:
{
// this part not implemented properly, missing an internal check
return (GetPropNum(0x5B) >= uint32(0x18));
}
}
}
uint32 GetLockId() const
{
switch (type)
@@ -1036,6 +1050,20 @@ struct GameObjectTemplate
void InitializeQueryData();
WorldPacket BuildQueryData(LocaleConstant loc) const;
private:
static std::vector<uint32> const _goTypeProperties[MAX_GAMEOBJECT_TYPE];
uint32 GetPropNum(int32 propNum) const
{
if (type >= MAX_GAMEOBJECT_TYPE || propNum >= 0x81)
return uint32(-1);
auto itr = std::find(_goTypeProperties[type].begin(), _goTypeProperties[type].end(), propNum);
if (itr == _goTypeProperties[type].end())
return uint32(-1);
return uint32(std::distance(_goTypeProperties[type].begin(), itr));
}
};
// From `gameobject_template_addon`