From 85359b129f2311997c6ae27dfbb6d63ac815b82e Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 16 Dec 2021 12:38:00 -0500 Subject: [PATCH] Core/GameObjects: goober gameobjects may reset only if they have a lock id or a reset time specified Port From (https://github.com/TrinityCore/TrinityCore/commit/09fe78dd59095fa31b83a846d5fcbb53dd3afb1b) --- Source/Game/Entities/GameObject/GameObject.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 53d375060..6e5cf9e8c 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -789,7 +789,9 @@ namespace Game.Entities m_usetimes = 0; } - SetGoState(GameObjectState.Ready); + // Only goobers with a lock id or a reset time may reset their go state + if (GetGoInfo().GetLockId() != 0 || GetGoInfo().GetAutoCloseTime() != 0) + SetGoState(GameObjectState.Ready); //any return here in case Battleground traps GameObjectOverride goOverride = GetGameObjectOverride();