Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from Atlante45/ess-pr

Browse source 
Fix wrong status when removing script
This commit is contained in:
Stephen Birarda 2017-01-24 18:44:05 -08:00 committed by GitHub
commit cd1ddd3a3a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -286,9 +286,11 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const
bool notRunning = !_entitiesScriptEngine->getEntityScriptDetails(entityID, details); bool notRunning = !_entitiesScriptEngine->getEntityScriptDetails(entityID, details);
if (entity && (reload || notRunning || details.scriptText != entity->getServerScripts())) { if (entity && (reload || notRunning || details.scriptText != entity->getServerScripts())) {
QString scriptUrl = entity->getServerScripts(); QString scriptUrl = entity->getServerScripts();
scriptUrl = ResourceManager::normalizeURL(scriptUrl); if (!scriptUrl.isEmpty()) {
qDebug() << "Loading entity server script" << scriptUrl << "for" << entityID; scriptUrl = ResourceManager::normalizeURL(scriptUrl);
ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload); qDebug() << "Loading entity server script" << scriptUrl << "for" << entityID;
ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload);
}
} }
} }
} }