Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

[8320] Imporovements in wild summoned gameobjects work. Author: VladimirMangos

Browse Source 
* Not set owner for will summoned gameobjects.
      Its not expected to have owner, and must be accessable to all players (or team).
    * Set for all objects summoned by spells: despawned by deafult for proper despawn withut owner.
    * Cleanup Spell::EffectSummonObjectWild.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-08 12:25:20 -05:00
parent f8a05d264f
commit 58dc6e180b
4 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/GameObject.cpp
View File

@@ -921,6 +921,7 @@ void GameObject::SetGoArtKit(uint8 kit)
data->ArtKit = kit;
}
/*
void GameObject::SetOwnerGUID(uint64 owner)
{
// Owner already found and different than expected owner - remove object from old owner
@@ -931,6 +932,7 @@ void GameObject::SetOwnerGUID(uint64 owner)
m_spawnedByDefault = false; // all object with owner is despawned after delay
SetUInt64Value(OBJECT_FIELD_CREATED_BY, owner);
}
*/
void GameObject::SwitchDoorOrButton(bool activate, bool alternative /* = false */)
{

21
src/game/GameObject.h
View File

@@ -591,10 +591,6 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
bool IsTransport() const;
void SetOwnerGUID(uint64 owner);
uint64 GetOwnerGUID() const { return GetUInt64Value(OBJECT_FIELD_CREATED_BY); }
Unit* GetOwner(bool inWorld = true) const;
uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; }
void UpdateRotationFields(float rotation2 = 0.0f, float rotation3 = 0.0f);
@@ -613,6 +609,21 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
bool LoadFromDB(uint32 guid, Map *map);
void DeleteFromDB();
void SetOwnerGUID(uint64 owner)
{
m_spawnedByDefault = false; // all object with owner is despawned after delay
SetUInt64Value(OBJECT_FIELD_CREATED_BY, owner);
}
uint64 GetOwnerGUID() const { return GetUInt64Value(OBJECT_FIELD_CREATED_BY); }
Unit* GetOwner(bool inWorld = true) const;
void SetSpellId(uint32 id)
{
m_spawnedByDefault = false; // all summoned object is despawned after delay
m_spellId = id;
}
uint32 GetSpellId() const { return m_spellId;}
time_t GetRespawnTime() const { return m_respawnTime; }
time_t GetRespawnTimeEx() const
{
@@ -641,8 +652,6 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
void Refresh();
void Delete();
void DeleteObjectWithOwner();
void SetSpellId(uint32 id) { m_spellId = id;}
uint32 GetSpellId() const { return m_spellId;}
void getFishLoot(Loot *loot, Player* loot_owner);
GameobjectTypes GetGoType() const { return GameobjectTypes(GetByteValue(GAMEOBJECT_BYTES_1, 1)); }
void SetGoType(GameobjectTypes type) { SetByteValue(GAMEOBJECT_BYTES_1, 1, type); }

45
src/game/SpellEffects.cpp
View File

@@ -4563,39 +4563,40 @@ void Spell::EffectSummonObjectWild(uint32 i)
}
int32 duration = GetSpellDuration(m_spellInfo);
pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
pGameObj->SetSpellId(m_spellInfo->Id);
if(pGameObj->GetGoType() != GAMEOBJECT_TYPE_FLAGDROP) // make dropped flag clickable for other players (not set owner guid (created by) for this)...
m_caster->AddGameObject(pGameObj);
// Wild object not have owner and check clickable by players
map->Add(pGameObj);
if(pGameObj->GetMapId() == 489 && pGameObj->GetGoType() == GAMEOBJECT_TYPE_FLAGDROP) //WS
if(pGameObj->GetGoType() == GAMEOBJECT_TYPE_FLAGDROP && m_caster->GetTypeId() == TYPEID_PLAYER)
{
if(m_caster->GetTypeId() == TYPEID_PLAYER)
Player *pl = (Player*)m_caster;
BattleGround* bg = ((Player *)m_caster)->GetBattleGround();
switch(pGameObj->GetMapId())
{
Player *pl = (Player*)m_caster;
BattleGround* bg = ((Player *)m_caster)->GetBattleGround();
if(bg && bg->GetTypeID()==BATTLEGROUND_WS && bg->GetStatus() == STATUS_IN_PROGRESS)
case 489: //WS
{
uint32 team = ALLIANCE;
if(bg && bg->GetTypeID()==BATTLEGROUND_WS && bg->GetStatus() == STATUS_IN_PROGRESS)
{
uint32 team = ALLIANCE;
if(pl->GetTeam() == team)
team = HORDE;
if(pl->GetTeam() == team)
team = HORDE;
((BattleGroundWS*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID(),team);
((BattleGroundWS*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID(),team);
}
break;
}
}
}
if(pGameObj->GetMapId() == 566 && pGameObj->GetGoType() == GAMEOBJECT_TYPE_FLAGDROP) //EY
{
if(m_caster->GetTypeId() == TYPEID_PLAYER)
{
BattleGround* bg = ((Player *)m_caster)->GetBattleGround();
if(bg && bg->GetTypeID()==BATTLEGROUND_EY && bg->GetStatus() == STATUS_IN_PROGRESS)
case 566: //EY
{
((BattleGroundEY*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID());
if(bg && bg->GetTypeID()==BATTLEGROUND_EY && bg->GetStatus() == STATUS_IN_PROGRESS)
{
((BattleGroundEY*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID());
}
break;
}
}
}
@@ -4609,7 +4610,7 @@ void Spell::EffectSummonObjectWild(uint32 i)
linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
linkedGO->SetSpellId(m_spellInfo->Id);
m_caster->AddGameObject(linkedGO);
// Wild object not have owner and check clickable by players
map->Add(linkedGO);
}
else

5
src/trinitycore/Master.cpp
View File

@@ -317,13 +317,8 @@ int Master::Run()
{
FreezeDetectorRunnable *fdr = new FreezeDetectorRunnable();
fdr->SetDelayTime(freeze_delay*1000);
<<<<<<< HEAD:src/mangosd/Master.cpp
ACE_Based::Thread t(*fdr);
t.setPriority(ACE_Based::High);
=======
ACE_Based::Thread t(fdr);
t.setPriority(ACE_Based::Highest);
>>>>>>> ca55c2a9d069aaef0d3deafb4884bfd8d3884444:src/mangosd/Master.cpp
}
///- Launch the world listener socket