Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Commands: .npc delete and .gobj delete now work while the specified guid is despawned.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/2924ae08038314e3c935a132cc56a4135d9f103c)
This commit is contained in:
hondacrx
2020-08-24 19:09:32 -04:00
parent 679dbcfb67
commit a27c86a385
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/GameObjectCommands.cs
+4 -1
View File
@@ -72,6 +72,9 @@ namespace Game.Chat
if (!ulong.TryParse(id, out ulong guidLow) || guidLow == 0) if (!ulong.TryParse(id, out ulong guidLow) || guidLow == 0)
return false; return false;
Player player = handler.GetSession().GetPlayer();
// force respawn to make sure we find something
player.GetMap().RemoveRespawnTime(SpawnObjectType.GameObject, guidLow, true);
GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow);
if (!obj) if (!obj)
{ {
@@ -82,7 +85,7 @@ namespace Game.Chat
ObjectGuid ownerGuid = obj.GetOwnerGUID(); ObjectGuid ownerGuid = obj.GetOwnerGUID();
if (ownerGuid.IsEmpty()) if (ownerGuid.IsEmpty())
{ {
Unit owner = Global.ObjAccessor.GetUnit(handler.GetPlayer(), ownerGuid); Unit owner = Global.ObjAccessor.GetUnit(player, ownerGuid);
if (!owner || !ownerGuid.IsPlayer()) if (!owner || !ownerGuid.IsPlayer())
{ {
handler.SendSysMessage(CypherStrings.CommandDelobjrefercreature, ownerGuid.ToString(), obj.GetGUID().ToString()); handler.SendSysMessage(CypherStrings.CommandDelobjrefercreature, ownerGuid.ToString(), obj.GetGUID().ToString());
Source/Game/Chat/Commands/NPCCommands.cs
+3
View File
@@ -879,6 +879,9 @@ namespace Game.Chat
if (!ulong.TryParse(cId, out ulong guidLow) || guidLow == 0) if (!ulong.TryParse(cId, out ulong guidLow) || guidLow == 0)
return false; return false;
// force respawn to make sure we find something
handler.GetSession().GetPlayer().GetMap().RemoveRespawnTime(SpawnObjectType.Creature, guidLow, true);
// then try to find it
creature = handler.GetCreatureFromPlayerMapByDbGuid(guidLow); creature = handler.GetCreatureFromPlayerMapByDbGuid(guidLow);
} }
else else