diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index 598f2e1f..585cd19f 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -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) {