From 46f8d92ed26c5142bb0b55b1169021360aa97003 Mon Sep 17 00:00:00 2001
From: Redo <a509dcfc@cock.li>
Date: Sun, 15 Sep 2019 04:43:54 -0500
Subject: [PATCH] changed the way callbacks work internally

---
 scripts/bricks.cs    | 18 +++++++++---------
 scripts/utilities.cs |  8 ++++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/bricks.cs b/scripts/bricks.cs
index fc8e42d..08203ee 100644
--- a/scripts/bricks.cs
+++ b/scripts/bricks.cs
@@ -48,8 +48,8 @@ function lualogic_removegate(%gate)
 	if(%gate.logicIsRemoved == false)
 	{
 		%db = %gate.getDataBlock();
-		if(isFunction(%db.getName(), "Logic_onRemove"))
-			%db.Logic_onRemove(%gate);
+		//if(isFunction(%db.getName(), "Logic_onRemove"))
+		//	%db.Logic_onRemove(%gate);
 
 		lualogic_send("RG;" @ %gate);
 		%gate.logicIsRemoved = true;
@@ -67,7 +67,7 @@ function lualogic_sendall()
 		{
 			%brick = %group.getObject(%a);
 			%data = %brick.getDataBlock();
-			if(%data.isLogic && %brick.isPlanted())
+			if(%data.isLogic && %brick.isPlanted() && !%brick.logicIsRemoved)
 			{
 				if(%data.isLogicWire)
 					lualogic_addwire(%brick);
@@ -149,14 +149,14 @@ package LuaLogic_Bricks
 	{
 		if(%this.isLogic)
 		{
+			%brick.Logic_HandleRemove();
+			
 			if(%this.isLogicWire)
 				lualogic_removewire(%brick);
 			else if(%this.isLogicGate)
 				lualogic_removegate(%brick);
-			
-			%brick.Logic_HandleRemove();
 		}
-
+		
 		parent::onDeath(%this, %brick);
 	}
 
@@ -164,14 +164,14 @@ package LuaLogic_Bricks
 	{
 		if(%this.isLogic && %brick.logicIsAdded)
 		{
+			%brick.Logic_HandleRemove();
+			
 			if(%this.isLogicWire)
 				lualogic_removewire(%brick);
 			else if(%this.isLogicGate)
 				lualogic_removegate(%brick);
-			
-			%brick.Logic_HandleRemove();
 		}
-
+		
 		parent::onRemove(%this, %brick);
 	}
 
diff --git a/scripts/utilities.cs b/scripts/utilities.cs
index 62cdcb4..30fc404 100644
--- a/scripts/utilities.cs
+++ b/scripts/utilities.cs
@@ -96,8 +96,8 @@ function lualogic_send(%data)
 {
 	if(isObject(LuaLogicTCP) && LuaLogicTCP.isConnected)
 	{
-		while(strpos(%data, ";;") != -1)
-			%data = strReplace(%data, ";;", "; ;");
+		//while(strpos(%data, ";;") != -1)
+		//	%data = strReplace(%data, ";;", "; ;");
 		
 		if(strlen(LuaLogicTCP.data) + strlen(%data) >= 1024)
 			LuaLogicTCP.sendData();
@@ -123,6 +123,10 @@ function lualogic_sendoptions()
 	lualogic_send("OPT;FX_TIME;"		@ $Pref::Server::LuaLogic::OPT_FX_TIME);
 }
 
+function lualogic_savedata(){
+	lualogic_send("SAVE");
+}
+
 function lualogic_sendinput(%gate, %argc, %arg0, %arg1, %arg2, %arg3, %arg4, %arg5, %arg6, %arg7, %arg8, %arg9, %arg10, %arg11, %arg12, %arg13, %arg14, %arg15)
 {
 	%args = %arg0;