From c702d922315b9732d6537585d2b5066a30366dca Mon Sep 17 00:00:00 2001
From: icomrade <icomrade@live.com>
Date: Sun, 17 Jul 2016 10:52:40 -0400
Subject: [PATCH] Remove SQF Based Duplicate UID Fix

Use the new DLL
---
 SQF/dayz_server/init/server_functions.sqf | 10 ----------
 SQF/dayz_server/system/server_monitor.sqf |  1 -
 2 files changed, 11 deletions(-)

diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf
index 290cbe2b6..6e414f0bb 100644
--- a/SQF/dayz_server/init/server_functions.sqf
+++ b/SQF/dayz_server/init/server_functions.sqf
@@ -224,16 +224,6 @@ dayz_objectUID2 = {
 					_key = _key + str(round(_dir));
 			};
 		};
-	// Make sure the generated key is not a duplicate
-	while {true} do {
-		if !(_key in currentObjectUIDs) exitWith {currentObjectUIDs set [count currentObjectUIDs,_key];};
-		keyStartNumber = keyStartNumber + 1;
-		if (keyStartNumber > 40000) exitWith { //Should never fail more times than total number of objects in database
-			diag_log format["ERROR: dayz_objectUID2 failed to correct duplicate objectUID: %1. This should not happen.",_key];
-		};
-		_key = str keyStartNumber;
-		diag_log format["Duplicate UID generated by dayz_objectUID2. Automatically corrected to +1= %1. This should rarely happen.",_key];
-	};
 	_key
 };
 
diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf
index 767e38e60..0bf595bab 100644
--- a/SQF/dayz_server/system/server_monitor.sqf
+++ b/SQF/dayz_server/system/server_monitor.sqf
@@ -67,7 +67,6 @@ if (_status == "ObjectStreamStart") then {
 	_hitPoints =	if ((typeName (_x select 6)) == "ARRAY") then { _x select 6 } else { [] };
 	_fuel =			if ((typeName (_x select 7)) == "SCALAR") then { _x select 7 } else { 0 };
 	_damage = 		if ((typeName (_x select 8)) == "SCALAR") then { _x select 8 } else { 0.9 };
-	_worldspace call dayz_objectUID2; // Set objectUIDs in currentObjectUIDs list to prevent duplicates
 	
 	//set object to be in maintenance mode
 	_maintenanceMode = false;