Merge pull request #15697 from ShinDarth/cd

Core/Player rewritten duel CD reset system
(cherry picked from commit 4204805d47)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
	src/server/game/Spells/SpellHistory.h
	src/server/game/World/World.h
This commit is contained in:
MitchesD
2015-10-17 18:38:31 +02:00
committed by Carbenium
parent 8ceffaef44
commit 63f253e95c
10 changed files with 66 additions and 34 deletions

View File

@@ -0,0 +1 @@
DELETE FROM `trinity_string` WHERE `entry` = 11010;