feat #1866: Moved save to after delete and ensured that deleted objects aren't processed (or crashing) objects update

src/client/js/objects/objBase.js

@@ -174,7 +174,7 @@ define([
 
 		offEvents: function () {
 			if (this.pather)
-				this.pather.clearPath();
+				this.pather.resetPath();
 
 			for (let e in this.eventCallbacks)
 				this.eventCallbacks[e].forEach(c => events.off(e, c));

src/server/components/portal/sendObjToZone.js

@@ -36,17 +36,19 @@ const sendObjToZone = async ({ obj, invokingObj, zoneName, toPos, toRelativePos
 		obj.y = invokingObj.obj.y + toRelativePos.y;
 	}
 
-	await obj.auth.doSave();
-
 	//Destroy, flush events and notify other objects
 	globalSyncer.processDestroyedObject(obj);
+	await obj.auth.doSave();
 
 	//Test code, remove later
-	const queued = Object.values(globalSyncer.buffer).filter(b => b.to.includes(serverId));
-	if (queued.length) {
-		/* eslint-disable-next-line */
-		console.log('Found', queued.length, 'events for rezoning object');
-	}
+	Object.entries(globalSyncer.buffer).forEach(([k, v]) => {
+		v.forEach(e => {
+			if (e.to.includes(serverId)) {
+			/* eslint-disable-next-line */
+			console.log('Found event', k, 'for rezoning object');
+			}
+		});
+	});
 
 	const simpleObj = obj.getSimple(true, false, true);
 

src/server/objects/objects.js

@@ -340,6 +340,14 @@ module.exports = {
 			if ((o.update) && (!o.destroyed))
 				o.update();
 
+			//When objects are sent to other zones, we destroy them immediately (thhrough sendObjToZone)
+			// In these cases, we DO need to remove it
+			if (o.forceDestroy) {
+				i--;
+				len--;
+				continue;
+			}
+
 			if (o.ttl) {
 				o.ttl--;
 				if (!o.ttl)

src/server/world/syncer.js

@@ -185,7 +185,10 @@ module.exports = {
 		const { id, serverId } = obj;
 
 		obj.destroyed = true;
-		this.flushForTarget(serverId);
+
+		//We mark forceDestroy to tell objects that we're destroying an object outside of the
+		// syncer's update method
+		obj.forceDestroy = true;
 
 		const msg = {
 			id: id,
@@ -194,6 +197,8 @@ module.exports = {
 
 		objects.removeObject(obj);
 
+		this.flushForTarget(serverId);
+
 		const fnQueueMsg = queue.bind(this, 'onGetObject');
 
 		//Find any players that have seen this obj