aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/base/world_database.sql10
-rw-r--r--sql/updates/9577_world_spell_group.sql5
-rw-r--r--src/server/game/Entities/Vehicle/Vehicle.cpp2
3 files changed, 14 insertions, 3 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index bd35af3ea96..5857baec290 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -6017,7 +6017,10 @@ INSERT INTO `spell_group` (`id`, `spell_id`) VALUES
(1109, 21562),
-- Prayer of/Shadow Protection
(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 */;
UNLOCK TABLES;
@@ -7614,7 +7617,10 @@ INSERT INTO spell_group_stack_rules (`group_id`, `stack_rule`) VALUES
(1099,1),
(1103,1),
(1046,1),
-(1107,1);
+(1107,1),
+(1108,1),
+(1109,1),
+(1110,1);
/*!40000 ALTER TABLE `spell_group_stack_rules` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/updates/9577_world_spell_group.sql b/sql/updates/9577_world_spell_group.sql
new file mode 100644
index 00000000000..c16baa3a5fc
--- /dev/null
+++ b/sql/updates/9577_world_spell_group.sql
@@ -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) \ No newline at end of file
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 36cbc9c1360..58036eb454b 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -188,7 +188,7 @@ void Vehicle::RemoveAllPassengers()
itr->second.passenger = NULL;
}
// 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();
}
}