From 164ae97d82078e9d1e1ece98f084b4dab3553fc6 Mon Sep 17 00:00:00 2001
From: Light2 <light_pswg@yahoo.com>
Date: Sun, 1 Dec 2013 19:40:28 +0100
Subject: [PATCH] Fixed error with conflicting object ids

---
 src/services/object/ObjectService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index 014c66b3..f09b694c 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -385,7 +385,7 @@ public class ObjectService implements INetworkDispatch {
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
-		if(getObject(newId) == null)
+		if(getObject(newId) == null && getCreatureFromDB(newId) == null)
 			return newId;
 		else
 			return generateObjectID();