Index: core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerObject.cpp
===================================================================
diff -u -N -r5881 -r5884
--- core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerObject.cpp	(.../PlayerObject.cpp)	(revision 5881)
+++ core3/trunk/MMOCoreORB/src/server/zone/objects/player/PlayerObject.cpp	(.../PlayerObject.cpp)	(revision 5884)
@@ -920,15 +920,15 @@
 		_implementation->setConversatingCreature(creature);
 }
 
-ManagedWeakReference<CreatureObject* > PlayerObject::getConversatingCreature() {
+unsigned long long PlayerObject::getConversatingCreature() {
 	PlayerObjectImplementation* _implementation = static_cast<PlayerObjectImplementation*>(_getImplementation());
 	if (_implementation == NULL) {
 		if (!deployed)
 			throw ObjectNotDeployedException(this);
 
 		DistributedMethod method(this, RPC_GETCONVERSATINGCREATURE__);
 
-		return static_cast<CreatureObject*>(method.executeWithObjectReturn());
+		return method.executeWithUnsignedLongReturn();
 	} else
 		return _implementation->getConversatingCreature();
 }
@@ -3323,11 +3323,6 @@
 		return true;
 	}
 
-	if (_name == "PlayerObject.duelList") {
-		TypeInfo<SortedVector<ManagedReference<CreatureObject* > > >::parseFromBinaryStream(&duelList, stream);
-		return true;
-	}
-
 	if (_name == "PlayerObject.bountyLockList") {
 		TypeInfo<BountyHunterTefRemovalTaskMap >::parseFromBinaryStream(&bountyLockList, stream);
 		return true;
@@ -3374,7 +3369,7 @@
 	}
 
 	if (_name == "PlayerObject.conversatingCreature") {
-		TypeInfo<ManagedWeakReference<CreatureObject* > >::parseFromBinaryStream(&conversatingCreature, stream);
+		TypeInfo<unsigned long long >::parseFromBinaryStream(&conversatingCreature, stream);
 		return true;
 	}
 
@@ -3762,14 +3757,6 @@
 	_totalSize = (uint32) (stream->getOffset() - (_offset + 4));
 	stream->writeInt(_offset, _totalSize);
 
-	_name = "PlayerObject.duelList";
-	_name.toBinaryStream(stream);
-	_offset = stream->getOffset();
-	stream->writeInt(0);
-	TypeInfo<SortedVector<ManagedReference<CreatureObject* > > >::toBinaryStream(&duelList, stream);
-	_totalSize = (uint32) (stream->getOffset() - (_offset + 4));
-	stream->writeInt(_offset, _totalSize);
-
 	_name = "PlayerObject.bountyLockList";
 	_name.toBinaryStream(stream);
 	_offset = stream->getOffset();
@@ -3846,7 +3833,7 @@
 	_name.toBinaryStream(stream);
 	_offset = stream->getOffset();
 	stream->writeInt(0);
-	TypeInfo<ManagedWeakReference<CreatureObject* > >::toBinaryStream(&conversatingCreature, stream);
+	TypeInfo<unsigned long long >::toBinaryStream(&conversatingCreature, stream);
 	_totalSize = (uint32) (stream->getOffset() - (_offset + 4));
 	stream->writeInt(_offset, _totalSize);
 
@@ -4003,7 +3990,7 @@
 	stream->writeInt(_offset, _totalSize);
 
 
-	return _count + 64;
+	return _count + 63;
 }
 
 PlayerObjectImplementation::PlayerObjectImplementation() {
@@ -4026,6 +4013,8 @@
 	cloningFacility = 0;
 	// server/zone/objects/player/PlayerObject.idl():  		skillPoints = 0;
 	skillPoints = 0;
+	// server/zone/objects/player/PlayerObject.idl():  		conversatingCreature = 0;
+	conversatingCreature = 0;
 	// server/zone/objects/player/PlayerObject.idl():  		forcePower = 0;
 	forcePower = 0;
 	// server/zone/objects/player/PlayerObject.idl():  		forcePowerMax = 0;
@@ -4206,11 +4195,15 @@
 }
 
 void PlayerObjectImplementation::setConversatingCreature(CreatureObject* creature) {
-	// server/zone/objects/player/PlayerObject.idl():  		conversatingCreature = creature;
-	conversatingCreature = creature;
+	// server/zone/objects/player/PlayerObject.idl():  			conversatingCreature = creature.getObjectID();
+	if (creature == NULL)	// server/zone/objects/player/PlayerObject.idl():  			conversatingCreature = 0;
+	conversatingCreature = 0;
+
+	else 	// server/zone/objects/player/PlayerObject.idl():  			conversatingCreature = creature.getObjectID();
+	conversatingCreature = creature->getObjectID();
 }
 
-ManagedWeakReference<CreatureObject* > PlayerObjectImplementation::getConversatingCreature() {
+unsigned long long PlayerObjectImplementation::getConversatingCreature() {
 	// server/zone/objects/player/PlayerObject.idl():  		return conversatingCreature;
 	return conversatingCreature;
 }
@@ -5227,7 +5220,7 @@
 		break;
 	case RPC_GETCONVERSATINGCREATURE__:
 		{
-			resp->insertLong(getConversatingCreature().get()->_getObjectID());
+			resp->insertLong(getConversatingCreature());
 		}
 		break;
 	case RPC_SETTRAINERZONENAME__STRING_:
@@ -6178,7 +6171,7 @@
 	(static_cast<PlayerObject*>(stub))->setConversatingCreature(creature);
 }
 
-ManagedWeakReference<CreatureObject* > PlayerObjectAdapter::getConversatingCreature() {
+unsigned long long PlayerObjectAdapter::getConversatingCreature() {
 	return (static_cast<PlayerObject*>(stub))->getConversatingCreature();
 }