Instructions Jenkins Doxygen

[fixed] stability issue 51/1051/1
authorVictor Popovici <theanswer@swgemu.com>
Sun, 3 Nov 2013 10:48:31 +0000 (11:48 +0100)
committerVictor Popovici <theanswer@swgemu.com>
Sun, 3 Nov 2013 10:48:31 +0000 (11:48 +0100)
Change-Id: Ia451c2a9da643309a6bde0b6419d02223f6a6757

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

index a28e7f6..a47611a 100644 (file)
@@ -306,8 +306,11 @@ void PetControlDeviceImplementation::storeObject(CreatureObject* player) {
        updateStatus(0);
 
        CreatureTemplate* creoTemp = pet->getCreatureTemplate();
-       pet->setFaction(creoTemp->getFaction().hashCode());
-       pet->setPvpStatusBitmask(creoTemp->getPvpBitmask(), false);
+
+       if (creoTemp != NULL) {
+               pet->setFaction(creoTemp->getFaction().hashCode());
+               pet->setPvpStatusBitmask(creoTemp->getPvpBitmask(), false);
+       }
 
        ManagedReference<PlayerObject*> ghost = player->getPlayerObject();
        ghost->removeFromActivePets(pet);