Instructions Jenkins Doxygen

[fixed] Resources attributes causing CTD's on Vendors or Bazaar (Mantis 15/1215/3
authorVictor Popovici <victorpopovici@gmail.com>
Thu, 19 Dec 2013 12:27:08 +0000 (13:27 +0100)
committerVictor Popovici <victorpopovici@gmail.com>
Thu, 19 Dec 2013 12:30:41 +0000 (13:30 +0100)
#4556)

[updated] Quantity on Skill Buff attributes.

Change-Id: I2f2d47cfeec2417e13046e6360e8ae594a32941f

MMOCoreORB/src/server/zone/managers/auction/AuctionManagerImplementation.cpp
MMOCoreORB/src/server/zone/objects/tangible/components/SkillBuffObjectAttributeListComponent.h

index 23969b3..d3bb20d 100644 (file)
@@ -1232,12 +1232,11 @@ void AuctionManagerImplementation::getItemAttributes(CreatureObject* player, uin
        UnicodeString description(auctionItem->getItemDescription());
        AttributeListMessage* msg = new AttributeListMessage(objectid, description);
 
-       object->fillAttributeList(msg, player);
-
        // For objects that don't fill the attribute list normally...
        if (object->getAttributeListComponent() != NULL) {
                object->getAttributeListComponent()->fillAttributeList(msg, player, object);
-       }
+       } else
+               object->fillAttributeList(msg, player);
 
        //msg->insertInt(0);
        String templateFile = TemplateManager::instance()->getTemplateFile(object->getClientObjectCRC());
index 6f4fdbd..f027826 100644 (file)
@@ -32,9 +32,12 @@ public:
                if(!object->isTangibleObject())
                        return;
 
-               ManagedReference<TangibleObject*> tano = cast<TangibleObject*>(object);
+               // Already handled in tano.
+               AttributeListComponent::fillAttributeList(alm, creature, object);
+
+               /*ManagedReference<TangibleObject*> tano = cast<TangibleObject*>(object);
                if(tano->getUseCount() > 1)
-                       alm->insertAttribute("quantity", tano->getUseCount());
+                       alm->insertAttribute("quantity", tano->getUseCount());*/
 
                VectorMap<String,float>* modifiers = skillBuff->getModifiers();