* Forgotten stack rules for rev f69fb2d3e0, thanks svetilo12

* Fix a crash in rev a972aa682b

--HG--
branch : trunk
This commit is contained in:
Shocker
2010-08-24 22:47:41 +03:00
parent 9b75f358ba
commit c0dda8b492
3 changed files with 14 additions and 3 deletions
+8 -2
View File
@@ -6017,7 +6017,10 @@ INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
(1109, 21562), (1109, 21562),
-- Prayer of/Shadow Protection -- Prayer of/Shadow Protection
(1110, 976), (1110, 976),
(1110, 27683); (1110, 27683),
(1006, 72586), -- Blessing of Forgotten Kings (Drums)
(1108, 72588), -- Gift of the Wild (Drums)
(1109, 72590); -- Fortitude (Scroll)
/*!40000 ALTER TABLE `spell_group` ENABLE KEYS */; /*!40000 ALTER TABLE `spell_group` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@@ -7614,7 +7617,10 @@ INSERT INTO spell_group_stack_rules (`group_id`, `stack_rule`) VALUES
(1099,1), (1099,1),
(1103,1), (1103,1),
(1046,1), (1046,1),
(1107,1); (1107,1),
(1108,1),
(1109,1),
(1110,1);
/*!40000 ALTER TABLE `spell_group_stack_rules` ENABLE KEYS */; /*!40000 ALTER TABLE `spell_group_stack_rules` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
+5
View File
@@ -0,0 +1,5 @@
DELETE FROM `spell_group` WHERE `spell_id` IN (72586, 72588, 72590);
INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
(1006, 72586), -- Blessing of Forgotten Kings (Drums)
(1108, 72588), -- Gift of the Wild (Drums)
(1109, 72590); -- Fortitude (Scroll)
+1 -1
View File
@@ -188,7 +188,7 @@ void Vehicle::RemoveAllPassengers()
itr->second.passenger = NULL; itr->second.passenger = NULL;
} }
// creature passengers mounted on player mounts should be despawned at dismount // creature passengers mounted on player mounts should be despawned at dismount
if (GetBase()->GetTypeId() == TYPEID_PLAYER && passenger->GetEntry()) if (GetBase()->GetTypeId() == TYPEID_PLAYER && passenger->ToCreature())
passenger->ToCreature()->ForcedDespawn(); passenger->ToCreature()->ForcedDespawn();
} }
} }