diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-10-05 16:44:08 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-10-05 16:44:08 +0200 |
| commit | 34678d8d39fccd0fa63c16874f20a23208a3e197 (patch) | |
| tree | d16ed8977a2a77c9ee4379b3d354cb1ce94eaf6f | |
| parent | 8a3ced48c180fe1ad1925879f71a13f936bb4f7e (diff) | |
| parent | ce54465d19499d87768fae2e9d79f9a088ba18e7 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
| -rw-r--r-- | sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql | 1 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql b/sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql new file mode 100644 index 00000000000..762a07620f9 --- /dev/null +++ b/sql/updates/world/2011_10_05_00_world_spell_linked_spell.sql @@ -0,0 +1 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = -58600; diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 75020b7e7bd..c894bf8afb7 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2044,7 +2044,7 @@ Rate.Drop.Item.ReferencedAmount = 1 # Description: Experience rates. # Default: 1 - (Rate.XP.Kill) # 1 - (Rate.XP.Quest) -# 1 - ( Rate.XP.Explore) +# 1 - (Rate.XP.Explore) Rate.XP.Kill = 1 Rate.XP.Quest = 1 |