diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp index fefa162f..dd1170e6 100755 --- a/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.cpp @@ -405,7 +405,7 @@ void IntangibleObject::onPermanentlyDestroyed() * Persists this object in the database. Will also persist all the objects it * is keeping track of. */ -bool IntangibleObject::persist() +void IntangibleObject::persist() { if (isAuthoritative() && isTheater()) { @@ -413,11 +413,11 @@ bool IntangibleObject::persist() { // we are not finished creating our objects, prevent persistance WARNING(true, ("IntangibleObject::persist called before all objects created")); - return false; + return; } if (isPersisted()) - return true; + return; ServerObject::persist(); @@ -471,15 +471,9 @@ bool IntangibleObject::persist() } } - return true; - } - else { + else ServerObject::persist(); - return true; - } - - return false; } // IntangibleObject::persist //------------------------------------------------------------------------------------------ diff --git a/engine/server/library/serverGame/src/shared/object/IntangibleObject.h b/engine/server/library/serverGame/src/shared/object/IntangibleObject.h index 25dd4ff3..e7776c4b 100755 --- a/engine/server/library/serverGame/src/shared/object/IntangibleObject.h +++ b/engine/server/library/serverGame/src/shared/object/IntangibleObject.h @@ -44,7 +44,7 @@ public: virtual float alter(float time); virtual void onPermanentlyDestroyed(); - virtual bool persist(); + virtual void persist(); virtual bool isVisibleOnClient (const Client & client) const; virtual void getAttributes (std::vector > &data) const; virtual bool onContainerAboutToTransfer(ServerObject * destination, ServerObject* transferer); diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index 8c6a6342..78839fcf 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -3203,11 +3203,11 @@ void ServerObject::onRemovedFromTriggerVolume(TriggerVolume & triggerVolume) * After this function is called, changes to this object will be sent to the database. */ -bool ServerObject::persist() +void ServerObject::persist() { // Do not persist buildout objects (buildout objects have negative networkIds) if (getNetworkId() < NetworkId::cms_invalid) - return false; + return; if (isAuthoritative()) { @@ -3221,7 +3221,7 @@ bool ServerObject::persist() if (!contained && !isPlayerControlled() && getPosition_p() != Vector::zero) { WARNING_STRICT_FATAL(true, ("Tried to persist non-player object %s in a space scene away from the origin (not persisting).", getDebugInformation().c_str())); - return false; + return; } } else @@ -3244,15 +3244,11 @@ bool ServerObject::persist() PositionUpdateTracker::sendPositionUpdate(*this); } - - return true; } else { sendControllerMessageToAuthServer(CM_persistObject, 0); } - - return false; } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.h b/engine/server/library/serverGame/src/shared/object/ServerObject.h index 24fbd6e8..c0c320bd 100755 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.h +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.h @@ -297,7 +297,7 @@ public: bool isInEndBaselines() const; bool isNeedingPobFixup() const; bool permanentlyDestroy (DeleteReasons::Enumerator reason); - virtual bool persist (); + virtual void persist (); virtual void onRemovingFromWorld (); virtual void unload (); void moveToPlayerAndUnload (const NetworkId &player); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp index 531c0048..25b4382a 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectCreate.cpp @@ -1125,11 +1125,8 @@ jboolean JNICALL ScriptMethodsObjectCreateNamespace::persistObject(JNIEnv *env, ServerObject* object = nullptr; if (!JavaLibrary::getObject(target, object)) return JNI_FALSE; - if (object->persist()) { - return JNI_TRUE; - } else { - return JNI_FALSE; - } + object->persist(); + return JNI_TRUE; } // JavaLibrary::persistObject /**