forked from TrinityCore/TrinityCore
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/WarHead/uwom-server into …
…wintergrasp * 'master' of https://github.com/WarHead/uwom-server: (21 commits) Correct some waypoint_scripts guids from last commit. DB/Upper & Lower Blackrock Spire: Scripts/Winter Veil: Fix possible exploit when kissing Winter Reveler. Also fix the visual cast of the debuff. Core/Spells: Fix correct targeting for Tricks of the Trade Fix code style and compile from 7e1c556 Core/Spells: Envenom (Fix buff duration from master poisoner. aura was being considered negative due to the damage effect. aura should be considered positive) Core/Items: Deathbringer's Will and Deathbringer's Will (HC) should proc Haste for a Druid not attack power. Core/Spells: Added spells for Fire Elemental Totem and Earth Elemental Totem Skript: Turm Utgarde - Svala Fixes. Core/Spells: Fixed Envenom damage Core/Spells: Fix second part of talent Nurturing Instinct Core/Petitions: Fix a typo in a sql query (d59c5e6) Fix a crash caused by m_itemSoulboundTradeable. Fix TrinityCore#4266. Fix typo from previous commit Fix warnings Core/Commands: Fixed crash when closing ticket in console, introduced in db8c10c Core/Scripts: fix quest A Not-So-Modest Proposal (10270) Core/Commands: Make GM Ticket commands console enabled. (Aokromes' Suggestions)--; Core/Channels: Don't send channel kick/ban notifications if kicker is GM and Channel.SilentlyGMJoin == 1. (Aokromes' Suggestions)--; Core/Commands: Show time left until shutdown in .server info. (Aokromes' Suggestions)--; ...
- Loading branch information
Showing
31 changed files
with
1,915 additions
and
361 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
DELETE FROM `trinity_string` WHERE `entry` IN(19,20); # unused entries | ||
INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES | ||
(19,'Update time diff: %u.'), | ||
(20,'Time left until shutdown/restart: %s'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
UPDATE `gameobject_template` SET `scriptName` = 'go_ethereal_teleport_pad' WHERE `entry` = 184073; -- Update Ethereal Teleport Pad scriptname |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
-- Greater Fire Elemental script | ||
UPDATE `creature_template` SET `ScriptName`='npc_fire_elemental' WHERE `entry`=15438; | ||
-- Greater Earth Elemental script | ||
UPDATE `creature_template` SET `ScriptName`='npc_earth_elemental' WHERE `entry`=15352; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
-- Bounus coef for Greater Fire Elemental spells | ||
DELETE FROM `spell_bonus_data` WHERE `entry` IN (13376,57984); | ||
INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`,`ap_bonus`, `ap_dot_bonus`, `comments`) VALUES | ||
(13376,0.032,-1,-1,-1,'Greater Fire Elemental - Fire Shield'), | ||
(57984,0.4289,-1,-1,-1,'Greater Fire Elemental - Fire Blast'); |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.