swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-13 21:01:08 -04:00
Code Issues Projects Releases Wiki Activity

Move no trade removal script attach from baselines to initialization

Browse Source
This commit is contained in:
AconiteX
2021-08-14 00:43:41 -04:00
parent 5c96c3343c
commit 89169339c6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/ServerObject.cpp
+6 -3
View File
@@ -1963,9 +1963,6 @@ void ServerObject::serverObjectEndBaselines(bool fromDatabase)
// If the object was created authoritative, trigger if needed
if (isAuthoritative())
triggerMadeAuthoritative();
if (markedNoTradeRemovable())
getScriptObject()->attachScript("item.special.no_trade_removable", true);
}
if (isPlayerControlled())
@@ -2566,7 +2563,13 @@ bool ServerObject::serverObjectInitializeFirstTimeObject(ServerObject *cell, Tra
int count = newTemplate->getScriptsCount();
for (int i = 0; i < count; ++i)
{
getScriptObject()->attachScript(newTemplate->getScripts(i), true);
}
if (markedNoTradeRemovable())
{
getScriptObject()->attachScript("item.special.no_trade_removable", true);
}
if (cell)
{