From eb936a78d9ef46507d3733ddfdb3754109403b22 Mon Sep 17 00:00:00 2001
From: Skaronator <Skaro@Skaronator.com>
Date: Sat, 1 Feb 2014 22:52:16 +0100
Subject: [PATCH] Don't need a extra function because its just used in
 maintainArea.sqf

---
 .../compile/server_maintainArea.sqf            |  8 ++++----
 SQF/dayz_server/init/server_functions.sqf      | 18 +++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/SQF/dayz_server/compile/server_maintainArea.sqf b/SQF/dayz_server/compile/server_maintainArea.sqf
index d243d95ba..8e4e8f041 100644
--- a/SQF/dayz_server/compile/server_maintainArea.sqf
+++ b/SQF/dayz_server/compile/server_maintainArea.sqf
@@ -18,12 +18,12 @@ if (_option == 1) then {
 				if (_objectUID != "0") then {
 					_x setDamage 0;
 					_key = format["CHILD:397:%1:", _objectUID]; // use UID if not "0" and ID is "0"
-					_key call server_maintainObj;
+					_data = "HiveExt" callExtension _key;
 				};
 			} else {
 				_x setDamage 0;
 				_key = format["CHILD:396:%1:", _objectID]; //Use ID instead of UID because ID is shorter
-				_key call server_maintainObj;
+				_data = "HiveExt" callExtension _key;
 			};
 		};
 	} forEach _objects;
@@ -38,12 +38,12 @@ if (_option == 2) then {
 			if (_objectUID != "0") then {
 				_targetObj setDamage 0;
 				_key = format["CHILD:397:%1:", _objectUID]; // use UID if not "0" and ID is "0"
-				_key call server_maintainObj;
+				_data = "HiveExt" callExtension _key;
 			};
 		} else {
 			_targetObj setDamage 0;
 			_key = format["CHILD:396:%1:", _objectID]; //Use ID instead of UID because ID is shorter
-			_key call server_maintainObj;
+			_data = "HiveExt" callExtension _key;
 			
 		};
 	};
diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf
index 8acc03a08..eb84a9709 100644
--- a/SQF/dayz_server/init/server_functions.sqf
+++ b/SQF/dayz_server/init/server_functions.sqf
@@ -20,12 +20,12 @@ server_playerSetup =			compile preprocessFileLineNumbers "\z\addons\dayz_server\
 server_onPlayerDisconnect = 	compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_onPlayerDisconnect.sqf";
 server_updateObject =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateObject.sqf";
 server_playerDied =				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDied.sqf";
-server_publishObj = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf";	//Creates the object in DB
-server_deleteObj =				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf"; 	//Removes the object from the DB
+server_publishObj = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf";
+server_deleteObj =				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf";
 server_swapObject =				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_swapObject.sqf"; 
-server_publishVeh = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; // Custom to add vehicles
-server_publishVeh2 = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; // Custom to add vehicles
-server_publishVeh3 = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf"; // Custom to add vehicles
+server_publishVeh = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf";
+server_publishVeh2 = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf";
+server_publishVeh3 = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf";
 server_tradeObj = 				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf";
 server_traders = 				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf";
 server_playerSync =				compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSync.sqf";
@@ -42,7 +42,8 @@ server_maintainArea = 			compile preprocessFileLineNumbers "\z\addons\dayz_serve
 /* PVS/PVC - Skaronator */
 server_sendToClient =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_sendToClient.sqf";
 
-onPlayerDisconnected 		"[_uid,_name] call server_onPlayerDisconnect;";
+//onPlayerConnected 			{[_uid,_name] call server_onPlayerConnect;};
+onPlayerDisconnected 		{[_uid,_name] call server_onPlayerDisconnect;};
 
 vehicle_handleInteract = {
 	private["_object"];
@@ -167,11 +168,6 @@ server_hiveReadWrite = {
 	_resultArray
 };
 
-server_maintainObj = {
-	private["_data"];
-	_data = "HiveExt" callExtension _this;
-};
-
 server_hiveReadWriteLarge = {
 	private["_key","_resultArray","_data"];
 	_key = _this;