diff --git a/changelog.txt b/changelog.txt index efac3956a..4ded63bf6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,9 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 07/01/2013 == +demonstar55: Fix Monster Summoning related to giants/cyclops +demonstar55: Prevent Monster Summoning from summoning a portal in bothunder + == 06/16/2013 == Secrets: Fixed an issue with RoF items and Req/Rec level above 100 appearing yellow. Recommended to enable the #iteminfo command for items that have a req/rec above 100 to display proper information regarding the info. diff --git a/zone/pets.cpp b/zone/pets.cpp index 4ea9c8bc1..446da3733 100644 --- a/zone/pets.cpp +++ b/zone/pets.cpp @@ -372,7 +372,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c "SELECT npcID FROM (spawnentry INNER JOIN spawn2 ON spawn2.spawngroupID = spawnentry.spawngroupID) " "INNER JOIN npc_types ON npc_types.id = spawnentry.npcID " "WHERE spawn2.zone = '%s' AND npc_types.bodytype NOT IN (11, 33, 66, 67) " - "AND npc_types.race NOT IN (0,1,2,3,4,5,6,7,8,9,10,11,12,44,55,67,71,72,73,77,78,81,90,92,93,94,106,112,114,127,128,130,139,141,183,236,237,238,239,254,266,330,378,379,380,381,382,383,404,522) " + "AND npc_types.race NOT IN (0,1,2,3,4,5,6,7,8,9,10,11,12,44,55,67,71,72,73,77,78,81,90,92,93,94,106,112,114,127,128,130,139,141,183,236,237,238,239,254,266,329,330,378,379,380,381,382,383,404,522) " "ORDER BY RAND() LIMIT 1", zone->GetShortName()), errbuf, &result)) { row = mysql_fetch_row(result); @@ -393,6 +393,8 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower, c npc_type->size = monster->size; npc_type->texture = monster->texture; npc_type->gender = monster->gender; + npc_type->luclinface = monster->luclinface; + npc_type->helmtexture = monster->helmtexture; } else { LogFile->write(EQEMuLog::Error, "Error loading NPC data for monster summoning pet (NPC ID %d)", monsterid);