--- deliantra/server/include/object.h	2006/12/13 03:28:42	1.51
+++ deliantra/server/include/object.h	2006/12/15 20:08:45	1.55
@@ -18,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 
 #ifndef OBJECT_H
@@ -61,6 +61,11 @@
 struct UUID
 {
   uint64 seq;
+
+  UUID () { }
+  UUID (uint64 seq) : seq(seq) { }
+  operator uint64() { return seq; }
+  void operator =(uint64 seq) { this->seq = seq; }
 };
 
 extern void init_uuid ();
@@ -257,8 +262,8 @@
   // this is often used in time-critical code, so optimise
   static bool can_merge (object *op1, object *op2)
   {
-    return op1->value != op2->value
-        && op1->name  != op2->name
+    return op1->value == op2->value
+        && op1->name  == op2->name
         && can_merge_slow (op1, op2);
   }