sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(gobject): elevator bug + prevent bugs related to faction and flags (#1402)

Browse Source 
- Closes #1396
This commit is contained in:
Francesco Borzì
2019-02-02 14:34:50 +01:00
committed by GitHub
parent 002f24aadb
commit 264dd0c65a
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/GameObject/GameObject.cpp
+1 -1
View File
@@ -1890,7 +1890,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId)
else else
{ {
// xinef: set faction of gameobject, if no faction - assume hostile // xinef: set faction of gameobject, if no faction - assume hostile
trigger->setFaction(GetGOInfo()->faction ? GetGOInfo()->faction : 14); trigger->setFaction(GetTemplateAddon() && GetTemplateAddon()->faction ? GetTemplateAddon()->faction : 14);
// Set owner guid for target if no owner availble - needed by trigger auras // Set owner guid for target if no owner availble - needed by trigger auras
// - trigger gets despawned and there's no caster avalible (see AuraEffect::TriggerSpell()) // - trigger gets despawned and there's no caster avalible (see AuraEffect::TriggerSpell())
// xinef: set proper orientation, fixes cast against stealthed targets // xinef: set proper orientation, fixes cast against stealthed targets
src/server/game/Entities/GameObject/GameObject.h
-2
View File
@@ -32,8 +32,6 @@ struct GameObjectTemplate
std::string IconName; std::string IconName;
std::string castBarCaption; std::string castBarCaption;
std::string unk1; std::string unk1;
uint32 faction;
uint32 flags;
float size; float size;
union // different GO types have different data field union // different GO types have different data field
{ {
src/server/game/Entities/Transport/Transport.cpp
+5 -2
View File
@@ -700,8 +700,11 @@ bool StaticTransport::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 ph
SetObjectScale(goinfo->size); SetObjectScale(goinfo->size);
SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction); if (GameObjectTemplateAddon const* addon = GetTemplateAddon())
SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags); {
SetUInt32Value(GAMEOBJECT_FACTION, addon->faction);
SetUInt32Value(GAMEOBJECT_FLAGS, addon->flags);
}
SetEntry(goinfo->entry); SetEntry(goinfo->entry);
SetName(goinfo->name); SetName(goinfo->name);