Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source
This commit is contained in:
Ovahlord
2018-06-03 18:39:41 +02:00
parent 61ddd060a5 e8a831dd33
commit b517a9101b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/4.3.4/2018_06_03_07_world.sql
View File

@@ -1,4 +1,4 @@
--
DELETE FROM `gameobject_template` WHERE `entry` = 208051;
INSERT INTO ``gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `size`, `Data0`, `Data1`, `Data2`, `Data3`, `Data4`, `Data5`, `Data6`, `VerifiedBuild`) VALUES
INSERT INTO `gameobject_template` (`entry`, `type`, `displayId`, `name`, `IconName`, `castBarCaption`, `unk1`, `size`, `Data0`, `Data1`, `Data2`, `Data3`, `Data4`, `Data5`, `Data6`, `VerifiedBuild`) VALUES
(208051, 8, 192, "Cooking Fire", "", "", "", 1, 4, 10, 0, 1, 0, 0, -1, -18019);

4
src/server/scripts/Pet/pet_generic.cpp
View File

@@ -338,9 +338,9 @@ class npc_pet_gen_lil_ragnaros : public CreatureScript
public:
npc_pet_gen_lil_ragnaros() : CreatureScript("npc_pet_gen_lil_ragnaros") { }
struct npc_pet_gen_lil_ragnarosAI : public PetAI
struct npc_pet_gen_lil_ragnarosAI : public ScriptedAI
{
npc_pet_gen_lil_ragnarosAI(Creature* creature) : PetAI(creature)
npc_pet_gen_lil_ragnarosAI(Creature* creature) : ScriptedAI(creature)
{
Initialize();
}