Instructions Jenkins Doxygen

[Fixed] stability issue 14/1914/1
authorIvojedi <ivojedi@swgemu.com>
Tue, 1 Jul 2014 21:26:00 +0000 (14:26 -0700)
committerIvojedi <ivojedi@swgemu.com>
Tue, 1 Jul 2014 21:26:00 +0000 (14:26 -0700)
Change-Id: Idc154a841503013896a5aad712f583c6ec7b1b74

MMOCoreORB/src/server/zone/objects/intangible/PetControlDeviceImplementation.cpp

index 936b70c..ed32644 100644 (file)
@@ -704,18 +704,19 @@ void PetControlDeviceImplementation::fillAttributeList(AttributeListMessage* alm
 
                        if (petType == PetManager::CREATUREPET) {
                                CreatureAttackMap* attMap = pet->getAttackMap();
-                               if (attMap->size() > 0) {
-                                       String str = StringIdManager::instance()->getStringId(("@combat_effects:" + pet->getAttackMap()->getCommand(0)).hashCode()).toString();
-                                       alm->insertAttribute("spec_atk_1", str);
-                               } else
-                                       alm->insertAttribute("spec_atk_1", " ---");
-
-                               if (attMap->size() > 1) {
-                                       String str = StringIdManager::instance()->getStringId(("@combat_effects:" + pet->getAttackMap()->getCommand(1)).hashCode()).toString();
-                                       alm->insertAttribute("spec_atk_2", str);
-                               } else
-                                       alm->insertAttribute("spec_atk_2", " ---");
-
+                               if (attMap != NULL) {
+                                       if (attMap->size() > 0) {
+                                               String str = StringIdManager::instance()->getStringId(("@combat_effects:" + pet->getAttackMap()->getCommand(0)).hashCode()).toString();
+                                               alm->insertAttribute("spec_atk_1", str);
+                                       } else
+                                               alm->insertAttribute("spec_atk_1", " ---");
+
+                                       if (attMap->size() > 1) {
+                                               String str = StringIdManager::instance()->getStringId(("@combat_effects:" + pet->getAttackMap()->getCommand(1)).hashCode()).toString();
+                                               alm->insertAttribute("spec_atk_2", str);
+                                       } else
+                                               alm->insertAttribute("spec_atk_2", " ---");
+                               }
                                CreatureTemplate* creatureTemplate = pet->getCreatureTemplate();
                                if (creatureTemplate != NULL) {
                                        if (creatureTemplate->getWeapons().size() > 0)