diff --git a/scripts/shared/native.js b/scripts/shared/native.js index b497da1e..5888d7d0 100644 --- a/scripts/shared/native.js +++ b/scripts/shared/native.js @@ -69,10 +69,12 @@ function getEntityData(entity, dataName) { // --------------------------------------------------------------------------- function setEntityData(entity, dataName, dataValue, syncToClients = true) { - if(!isNull(server)) { - return entity.setData(dataName, dataValue, syncToClients); - } else { - return entity.setData(dataName, dataValue); + if(entity != null) { + if(!isNull(server)) { + return entity.setData(dataName, dataValue, syncToClients); + } else { + return entity.setData(dataName, dataValue); + } } }