aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmake/showoptions.cmake8
-rw-r--r--contrib/valgrind/helgrind.supp115
-rw-r--r--sql/updates/world/2014_09_20_04_world_creature.sql370
-rw-r--r--sql/updates/world/2014_09_20_05_world_conditions.sql1
-rw-r--r--sql/updates/world/2014_09_21_00_world_spell_dbc.sql5
-rw-r--r--sql/updates/world/2014_09_21_00_world_spell_dbc_434.sql1
-rw-r--r--sql/updates/world/2014_09_21_01_world_spell_dbc.sql213
-rw-r--r--sql/updates/world/2014_09_21_02_world_creature.sql2
-rw-r--r--src/server/authserver/CMakeLists.txt1
-rw-r--r--src/server/collision/CMakeLists.txt1
-rw-r--r--src/server/game/CMakeLists.txt1
-rw-r--r--src/server/game/DataStores/DBCfmt.h2
-rw-r--r--src/server/game/Scripting/ScriptMgr.h2
-rw-r--r--src/server/scripts/CMakeLists.txt1
-rw-r--r--src/server/shared/CMakeLists.txt1
-rw-r--r--src/server/shared/Define.h5
-rw-r--r--src/server/worldserver/CMakeLists.txt1
17 files changed, 636 insertions, 94 deletions
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
index 2d21136d661..9b2c849ec39 100644
--- a/cmake/showoptions.cmake
+++ b/cmake/showoptions.cmake
@@ -93,5 +93,13 @@ if ( NOJEM )
message(" *** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!")
endif()
+if ( HELGRIND )
+ message("")
+ message(" *** HELGRIND - WARNING!")
+ message(" *** Please specify the valgrind include directory in VALGRIND_INCLUDE_DIR option if you get build errors")
+ message(" *** Please note that this is for DEBUGGING WITH HELGRIND only!")
+ add_definitions(-DHELGRIND)
+endif()
+
message("")
diff --git a/contrib/valgrind/helgrind.supp b/contrib/valgrind/helgrind.supp
index 930a264faf7..59dec3018c6 100644
--- a/contrib/valgrind/helgrind.supp
+++ b/contrib/valgrind/helgrind.supp
@@ -1,116 +1,47 @@
{
- [1] ACE_Future::ready() race in WorldSession::ProcessQueryCallbacks(), a lock is used anyway in ACE_Future::get()/set()
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZN14ACE_Future_RepIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE3setERKS4_R10ACE_FutureIS4_E
- fun:_ZN10ACE_FutureIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE3setERKS4_
- fun:_ZN21PreparedStatementTask7ExecuteEv
+ fun:_ZNSt13__atomic_baseIlE5storeElSt12memory_order
+ fun:_ZNSt13__atomic_baseIlEaSEl
}
{
- [1] ACE_Future::ready() race in WorldSession::ProcessQueryCallbacks(), a lock is used anyway in ACE_Future::get()/set()
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZN14ACE_Future_RepIP14SQLQueryHolderE3setERKS1_R10ACE_FutureIS1_E
- fun:_ZN10ACE_FutureIP14SQLQueryHolderE3setERKS1_
- fun:_ZN18SQLQueryHolderTask7ExecuteEv
+ fun:_ZNKSt13__atomic_baseIlE4loadESt12memory_order
+ fun:_ZNKSt13__atomic_baseIlEcvlEv
}
{
- [2] ACE_Future::ready() race in WorldSession::ProcessQueryCallbacks(), a lock is used anyway in ACE_Future::get()/set()
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZNK14ACE_Future_RepIP14SQLQueryHolderE5readyEv
- fun:_ZNK10ACE_FutureIP14SQLQueryHolderE5readyEv
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
+ fun:_ZNSt13__atomic_baseIbE5storeEbSt12memory_order
+ fun:_ZNSt13__atomic_baseIbEaSEb
}
{
- [3] ACE_Future::attach()/detach() false positive in WorldSession::HandleCharEnumOpcode()
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZN14ACE_Future_RepIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE6attachERPS5_
+ fun:_ZNKSt13__atomic_baseIbE4loadESt12memory_order
+ fun:_ZNKSt11atomic_boolcvbEv
}
{
- [4] ACE_Future::get() race in WorldSession::ProcessQueryCallbacks() , a lock is used anyway in ACE_Future::get()/set(), the only case when this is a race is if the same ACE_Future is reused by another thread
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZNK14ACE_Future_RepIP14SQLQueryHolderE3getERS1_P14ACE_Time_Value
- fun:_ZNK10ACE_FutureIP14SQLQueryHolderE3getERS1_P14ACE_Time_Value
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
+ fun:_ZNSt13__atomic_baseIiE5storeEiSt12memory_order
+ fun:_ZNSt13__atomic_baseIiEaSEi
}
{
- [4] ACE_Future::get() race in WorldSession::ProcessQueryCallbacks() , a lock is used anyway in ACE_Future::get()/set(), the only case when this is a race is if the same ACE_Future is reused by another thread
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZNK10ACE_FutureIN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEE5readyEv
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
+ fun:_ZNSt13__atomic_baseIiEmIEi
}
{
- [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready())
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZN6Player10LoadFromDBEjP14SQLQueryHolder
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
+ fun:_ZNSt13__atomic_baseIjE5storeEjSt12memory_order
+ fun:_ZNSt13__atomic_baseIjEaSEj
}
{
- [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready())
+ [1] std::atomic
Helgrind:Race
- ...
- fun:_ZN14SQLQueryHolder17GetPreparedResultEm
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
-}
-{
- [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready())
- Helgrind:Race
- ...
- fun:_ZN12WorldSession15LoadAccountDataEN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexEEj
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
-}
-{
- [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready())
- Helgrind:Race
- ...
- fun:_ZNK17PreparedResultSet5FetchEv
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
-}
-{
- [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready())
- Helgrind:Race
- ...
- fun:_ZNK5Field9GetUInt32Ev
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
-}
-{
- [5] Race in WorldSession::ProcessQueryCallbacks(), added ASSERT(!m_result.ready())
- Helgrind:Race
- ...
- fun:_ZNK5Field8GetUInt8Ev
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
-}
-{
- [6] False positive of possible race about ACE_Strong_Bound_Ptr
- Helgrind:Race
- ...
- fun:_ZN17PreparedResultSetD1Ev
- fun:_ZN20ACE_Strong_Bound_PtrI17PreparedResultSet16ACE_Thread_MutexED1Ev
- fun:_ZN7Trinity7AutoPtrI17PreparedResultSet16ACE_Thread_MutexED1Ev
- fun:_ZN12WorldSession17HandlePlayerLoginEP16LoginQueryHolder
- fun:_ZN12WorldSession21ProcessQueryCallbacksEv
-}
-{
- [7] Race condition on bool in ACE, ignore
- Helgrind:Race
- fun:_ZN11WorldSocket12handle_closeEim
- fun:_ZN20ACE_Dev_Poll_Reactor16remove_handler_iEimP17ACE_Event_Handler
-}
-{
- [7] Race condition on bool in ACE, ignore
- Helgrind:Race
- fun:_ZNK11WorldSocket8IsClosedEv
- fun:_ZN12WorldSession6UpdateEjR12PacketFilter
- fun:_ZN5World14UpdateSessionsEj
+ fun:_ZNKSt13__atomic_baseIjE4loadESt12memory_order
+ fun:_ZNKSt13__atomic_baseIjEcvjEv
}
diff --git a/sql/updates/world/2014_09_20_04_world_creature.sql b/sql/updates/world/2014_09_20_04_world_creature.sql
new file mode 100644
index 00000000000..657fcab6e80
--- /dev/null
+++ b/sql/updates/world/2014_09_20_04_world_creature.sql
@@ -0,0 +1,370 @@
+-- Infernal fixup
+SET @CGUID := 213374;
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+345;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0,21417,530,1,1,-3984.524,1981.606,111.9036,1.623156,180,0,0), -- Invis Infernal Caster
+(@CGUID+1,21417,530,1,1,-3848.731,2218.538,115.8726,5.72468,180,0,0), -- Invis Infernal Caster
+(@CGUID+2,21417,530,1,1,-3782.233,2284.056,106.4085,0.5061455,180,0,0), -- Invis Infernal Caster
+(@CGUID+3,21417,530,1,1,-3650.55,2117.248,96.15105,4.991642,180,0,0), -- Invis Infernal Caster
+(@CGUID+4,21417,530,1,1,-3750.127,1982.458,110.6358,0.2094395,180,0,0), -- Invis Infernal Caster
+(@CGUID+5,21417,530,1,1,-3915.97,1915.495,111.9221,6.178465,180,0,0), -- Invis Infernal Caster
+(@CGUID+6,21417,530,1,1,-3847.753,2182.979,118.2413,2.879793,180,0,0), -- Invis Infernal Caster
+(@CGUID+7,21417,530,1,1,-3784.328,2250.314,108.4108,1.204277,180,0,0), -- Invis Infernal Caster
+(@CGUID+8,21417,530,1,1,-3684.208,2116.267,98.7243,1.012291,180,0,0), -- Invis Infernal Caster
+(@CGUID+9,21417,530,1,1,-3684.184,2183.208,98.87512,0.7679449,180,0,0), -- Invis Infernal Caster
+(@CGUID+10,21417,530,1,1,-3717.339,2150.095,102.4835,4.869469,180,0,0), -- Invis Infernal Caster
+(@CGUID+11,21417,530,1,1,-3848.535,2249.425,117.7698,0.3839724,180,0,0), -- Invis Infernal Caster
+(@CGUID+12,21417,530,1,1,-3716.858,2184.769,100.3341,3.385939,180,0,0), -- Invis Infernal Caster
+(@CGUID+13,21417,530,1,1,-3814.972,2048.552,111.7685,3.857178,180,0,0), -- Invis Infernal Caster
+(@CGUID+14,21417,530,1,1,-3782.915,2216.472,106.7437,4.206244,180,0,0), -- Invis Infernal Caster
+(@CGUID+15,21417,530,1,1,-3952.906,1949.036,113.0863,0.01745329,180,0,0), -- Invis Infernal Caster
+(@CGUID+16,21417,530,1,1,-3151.26,2384.204,75.54855,1.012291,180,0,0), -- Invis Infernal Caster
+(@CGUID+17,21417,530,1,1,-3284.245,2416.116,74.99055,4.782202,180,0,0), -- Invis Infernal Caster
+(@CGUID+18,21417,530,1,1,-3215.366,2350.81,79.94222,5.253441,180,0,0), -- Invis Infernal Caster
+(@CGUID+19,21417,530,1,1,-3253.81,2382.822,77.23854,4.18879,180,0,0), -- Invis Infernal Caster
+(@CGUID+20,21417,530,1,1,-3015.17,2749.296,90.49119,1.623156,180,0,0), -- Invis Infernal Caster
+(@CGUID+21,21417,530,1,1,-3150.634,2650.796,79.8391,0.1745329,180,0,0), -- Invis Infernal Caster
+(@CGUID+22,21417,530,1,1,-3250.92,2582.977,84.55005,3.769911,180,0,0), -- Invis Infernal Caster
+(@CGUID+23,21417,530,1,1,-3132.9,2618.462,85.12831,4.642576,180,0,0), -- Invis Infernal Caster
+(@CGUID+24,21417,530,1,1,-3217.865,2316.551,79.93561,0.6283185,180,0,0), -- Invis Infernal Caster
+(@CGUID+25,21417,530,1,1,-3118.442,2684.229,80.99373,3.595378,180,0,0), -- Invis Infernal Caster
+(@CGUID+26,21417,530,1,1,-3217.382,2617.26,76.04425,5.497787,180,0,0), -- Invis Infernal Caster
+(@CGUID+27,21417,530,1,1,-3217.203,2649.803,82.91985,3.124139,180,0,0), -- Invis Infernal Caster
+(@CGUID+28,21417,530,1,1,-3217.627,2415.979,76.36507,3.385939,180,0,0), -- Invis Infernal Caster
+(@CGUID+29,21417,530,1,1,-3251.344,2350.913,78.39026,4.991642,180,0,0), -- Invis Infernal Caster
+(@CGUID+30,21417,530,1,1,-3149.884,2349.922,77.33376,1.675516,180,0,0), -- Invis Infernal Caster
+(@CGUID+31,21417,530,1,1,-3049.222,2750.505,93.73365,6.178465,180,0,0), -- Invis Infernal Caster
+(@CGUID+32,21417,530,1,1,-3253.219,2617.294,78.85391,0.1047198,180,0,0), -- Invis Infernal Caster
+(@CGUID+33,21417,530,1,1,-3184.074,2484.081,81.4856,0.3839724,180,0,0), -- Invis Infernal Caster
+(@CGUID+34,21417,530,1,1,-3214.168,2549.114,81.14032,6.108652,180,0,0), -- Invis Infernal Caster
+(@CGUID+35,21417,530,1,1,-3217.122,2584.05,83.54726,5.67232,180,0,0), -- Invis Infernal Caster
+(@CGUID+36,21417,530,1,1,-3882.729,2016.661,117.6816,0.1745329,180,0,0), -- Invis Infernal Caster
+(@CGUID+37,21417,530,1,1,-3815.163,2020.599,112.4155,3.124139,180,0,0), -- Invis Infernal Caster
+(@CGUID+38,21417,530,1,1,-3816.519,2183.856,111.5845,3.543018,180,0,0), -- Invis Infernal Caster
+(@CGUID+39,21417,530,1,1,-3983.967,1948.156,113.7687,4.520403,180,0,0), -- Invis Infernal Caster
+(@CGUID+40,21417,530,1,1,-3683.92,2083.785,100.3279,5.253441,180,0,0), -- Invis Infernal Caster
+(@CGUID+41,21417,530,1,1,-3782.356,2150.691,96.66125,4.852015,180,0,0), -- Invis Infernal Caster
+(@CGUID+42,21417,530,1,1,-3883.075,1981.748,118.8545,3.01942,180,0,0), -- Invis Infernal Caster
+(@CGUID+43,21417,530,1,1,-3950.111,1916.865,117.4025,1.256637,180,0,0), -- Invis Infernal Caster
+(@CGUID+44,21417,530,1,1,-3848.941,1982.252,116.0469,3.577925,180,0,0), -- Invis Infernal Caster
+(@CGUID+45,21417,530,1,1,-3849.142,1947.424,115.0747,3.595378,180,0,0), -- Invis Infernal Caster
+(@CGUID+46,21417,530,1,1,-3182.855,2515.701,80.8093,0.5585054,180,0,0), -- Invis Infernal Caster
+(@CGUID+47,21417,530,1,1,-3017.363,2685.132,86.33258,0.01745329,180,0,0), -- Invis Infernal Caster
+(@CGUID+48,21417,530,1,1,-3216.789,2516.988,79.50715,5.72468,180,0,0), -- Invis Infernal Caster
+(@CGUID+49,21417,530,1,1,-3184.914,2418.145,77.62437,0.7679449,180,0,0), -- Invis Infernal Caster
+(@CGUID+50,21417,530,1,1,-3251.479,2550.402,82.99747,4.852015,180,0,0), -- Invis Infernal Caster
+(@CGUID+51,21417,530,1,1,-3152.159,2684.04,82.59605,3.01942,180,0,0), -- Invis Infernal Caster
+(@CGUID+52,21417,530,1,1,-3217.404,2482.46,80.76971,1.099557,180,0,0), -- Invis Infernal Caster
+(@CGUID+53,21417,530,1,1,-3183.521,2316.864,81.50328,5.270895,180,0,0), -- Invis Infernal Caster
+(@CGUID+54,21417,530,1,1,-3215.852,2383.446,76.55784,4.869469,180,0,0), -- Invis Infernal Caster
+(@CGUID+55,21417,530,1,1,-3251.069,2517.376,80.41834,2.879793,180,0,0), -- Invis Infernal Caster
+(@CGUID+56,21417,530,1,1,-3018.181,2717.189,87.26342,4.520403,180,0,0), -- Invis Infernal Caster
+(@CGUID+57,21417,530,1,1,-3185.583,2545.366,81.56517,3.543018,180,0,0), -- Invis Infernal Caster
+(@CGUID+58,21417,530,1,1,-3251.094,2649.249,78.578,3.857178,180,0,0), -- Invis Infernal Caster
+(@CGUID+59,21417,530,1,1,-3283.888,2448.511,84.68885,0.5061455,180,0,0), -- Invis Infernal Caster
+(@CGUID+60,21417,530,1,1,-3116.213,2718.082,83.18572,0,180,0,0), -- Invis Infernal Caster
+(@CGUID+61,21417,530,1,1,-3250.521,2415.466,74.27576,4.29351,180,0,0), -- Invis Infernal Caster
+(@CGUID+62,21417,530,1,1,-3051.288,2684.388,85.61096,1.256637,180,0,0), -- Invis Infernal Caster
+(@CGUID+63,21417,530,1,1,-3152.731,2515.51,80.89338,4.206244,180,0,0), -- Invis Infernal Caster
+(@CGUID+64,21417,530,1,1,-3084.245,2683.924,84.00232,1.27409,180,0,0), -- Invis Infernal Caster
+(@CGUID+65,21417,530,1,1,-3250.821,2318.462,79.6662,0.2094395,180,0,0), -- Invis Infernal Caster
+(@CGUID+66,21417,530,1,1,-3683.686,2149.842,100.5884,4.18879,180,0,0), -- Invis Infernal Caster
+(@CGUID+67,21417,530,1,1,-3849.951,2118.274,118.2868,5.67232,180,0,0), -- Invis Infernal Caster
+(@CGUID+68,21417,530,1,1,-3716.392,1983.245,103.9398,1.675516,180,0,0), -- Invis Infernal Caster
+(@CGUID+69,21417,530,1,1,-3815.908,2283.845,114.5049,1.099557,180,0,0), -- Invis Infernal Caster
+(@CGUID+70,21417,530,1,1,-3849.17,2016.991,112.8153,4.642576,180,0,0), -- Invis Infernal Caster
+(@CGUID+71,21417,530,1,1,-3915.83,1947.938,112.6526,1.27409,180,0,0), -- Invis Infernal Caster
+(@CGUID+72,21417,530,1,1,-3883.464,2284.493,163.0042,4.782202,180,0,0), -- Invis Infernal Caster
+(@CGUID+73,21417,530,1,1,-3816.278,2217.191,111.5392,0.5585054,180,0,0), -- Invis Infernal Caster
+(@CGUID+74,21417,530,1,1,-3782.786,2048.165,109.4187,0.1047198,180,0,0), -- Invis Infernal Caster
+(@CGUID+75,21417,530,1,1,-3783.965,2183.781,100.2728,6.108652,180,0,0), -- Invis Infernal Caster
+(@CGUID+76,21417,530,1,1,-3782.849,1949.918,115.2088,3.176499,180,0,0), -- Invis Infernal Caster
+(@CGUID+77,21417,530,1,1,-4016.118,1982.245,110.2039,1.867502,180,0,0), -- Invis Infernal Caster
+(@CGUID+78,21417,530,1,1,-3817.252,2118.097,111.8624,3.769911,180,0,0), -- Invis Infernal Caster
+(@CGUID+79,21417,530,1,1,-3882.66,1948.717,118.7108,0,180,0,0), -- Invis Infernal Caster
+(@CGUID+80,21417,530,1,1,-3119.217,2650.802,80.77679,3.577925,180,0,0), -- Invis Infernal Caster
+(@CGUID+81,21417,530,1,1,-3183.906,2383.068,74.97648,0.5235988,180,0,0), -- Invis Infernal Caster
+(@CGUID+82,21417,530,1,1,-3184.279,2351.161,80.70064,2.617994,180,0,0), -- Invis Infernal Caster
+(@CGUID+83,21417,530,1,1,-3154.01,2482.314,81.76605,1.204277,180,0,0), -- Invis Infernal Caster
+(@CGUID+84,21417,530,1,1,-2982.704,2716.343,93.03645,1.867502,180,0,0), -- Invis Infernal Caster
+(@CGUID+85,21417,530,1,1,-3716.967,2117.047,102.136,0.5235988,180,0,0), -- Invis Infernal Caster
+(@CGUID+86,21417,530,1,1,-3839.573,2322.988,155.4595,4.29351,180,0,0), -- Invis Infernal Caster
+(@CGUID+87,21417,530,1,1,-3783.13,1918.502,118.9195,0.1047198,180,0,0), -- Invis Infernal Caster
+(@CGUID+88,21417,530,1,1,-3749.309,1949.231,119.2604,0.6283185,180,0,0), -- Invis Infernal Caster
+(@CGUID+89,21417,530,1,1,-3715.781,2084.163,101.0835,2.617994,180,0,0), -- Invis Infernal Caster
+(@CGUID+90,21417,530,1,1,-3782.97,2082.781,107.0305,5.497787,180,0,0), -- Invis Infernal Caster
+(@CGUID+91,21736,530,1,1,-3785.576,1919.076,96.30577,0,180,0,0), -- Wildhammer Defender
+(@CGUID+92,21736,530,1,1,-3715.138,2083.415,79.66703,0,180,0,0), -- Wildhammer Defender
+(@CGUID+93,21736,530,1,1,-3850.167,2177.789,95.9984,1.513471,180,0,0), -- Wildhammer Defender
+(@CGUID+94,21736,530,1,1,-3853.686,2179.85,96.30024,0,180,0,0), -- Wildhammer Defender
+(@CGUID+95,21736,530,1,1,-3786.517,2084.905,87.85854,5.709996,180,0,0), -- Wildhammer Defender
+(@CGUID+96,21736,530,1,1,-3782.399,1951.748,92.5993,5.88176,180,0,0), -- Wildhammer Defender
+(@CGUID+97,21736,530,1,1,-3718.014,2181.986,76.99637,5.811946,180,0,0), -- Wildhammer Defender
+(@CGUID+98,21736,530,1,1,-3717.728,2184.822,77.34786,0,180,0,0), -- Wildhammer Defender
+(@CGUID+99,21736,530,1,1,-3716.572,2179.32,77.10128,0,180,0,0), -- Wildhammer Defender
+(@CGUID+100,21736,530,1,1,-3716.626,2086.982,79.51428,0,180,0,0), -- Wildhammer Defender
+(@CGUID+101,21736,530,1,1,-3785.56,2220.834,86.78856,0,180,0,0), -- Wildhammer Defender
+(@CGUID+102,21736,530,1,1,-3786.915,2213.982,86.35015,0,180,0,0), -- Wildhammer Defender
+(@CGUID+103,21736,530,1,1,-3754.192,1949.79,95.43329,0.07044293,180,0,0), -- Wildhammer Defender
+(@CGUID+104,21736,530,1,1,-3881.389,1953.138,98.51082,0,180,0,0), -- Wildhammer Defender
+(@CGUID+105,21736,530,1,1,-3952.434,1920.917,95.18379,4.118755,180,0,0), -- Wildhammer Defender
+(@CGUID+106,21736,530,1,1,-3686.288,2185.272,76.30484,5.323254,180,0,0), -- Wildhammer Defender
+(@CGUID+107,21736,530,1,1,-3782.458,2248.527,86.35019,5.438312,180,0,0), -- Wildhammer Defender
+(@CGUID+108,21736,530,1,1,-3785.566,2248.954,87.32341,5.983068,180,0,0), -- Wildhammer Defender
+(@CGUID+109,21736,530,1,1,-3783.679,2247.262,87.07255,1.895778,180,0,0), -- Wildhammer Defender
+(@CGUID+110,21736,530,1,1,-3682.088,2116.407,76.8222,0,180,0,0), -- Wildhammer Defender
+(@CGUID+111,21736,530,1,1,-3685.947,2118.919,77.47746,0.6981317,180,0,0), -- Wildhammer Defender
+(@CGUID+112,21736,530,1,1,-3818.349,2217.67,91.99023,0,180,0,0), -- Wildhammer Defender
+(@CGUID+113,21736,530,1,1,-3816.834,2214.177,91.15456,0,180,0,0), -- Wildhammer Defender
+(@CGUID+114,21736,530,1,1,-3815.677,2219.699,91.43941,6.265732,180,0,0), -- Wildhammer Defender
+(@CGUID+115,21736,530,1,1,-3717.918,2153.133,79.03515,0,180,0,0), -- Wildhammer Defender
+(@CGUID+116,21736,530,1,1,-3717.987,2148.664,79.01578,0,180,0,0), -- Wildhammer Defender
+(@CGUID+117,21736,530,1,1,-3849.327,2250.661,96.73158,0.3839724,180,0,0), -- Wildhammer Defender
+(@CGUID+118,21736,530,1,1,-3814.681,2022.835,93.9146,0,180,0,0), -- Wildhammer Defender
+(@CGUID+119,21736,530,1,1,-3816.908,2020.721,93.36675,5.794493,180,0,0), -- Wildhammer Defender
+(@CGUID+120,21736,530,1,1,-3817.027,2024.602,93.94501,5.225316,180,0,0), -- Wildhammer Defender
+(@CGUID+121,21736,530,1,1,-3849.961,1985.673,95.34592,0,180,0,0), -- Wildhammer Defender
+(@CGUID+122,21736,530,1,1,-3783.067,2182.528,81.12646,0,180,0,0), -- Wildhammer Defender
+(@CGUID+123,21736,530,1,1,-3913.247,1920.676,92.80242,0,180,0,0), -- Wildhammer Defender
+(@CGUID+124,21736,530,1,1,-3979.57,1950.709,94.98695,5.51524,180,0,0), -- Wildhammer Defender
+(@CGUID+125,21736,530,1,1,-3716.549,1987.614,84.95028,4.709068,180,0,0), -- Wildhammer Defender
+(@CGUID+126,21736,530,1,1,-3718.374,1979.319,85.11328,0,180,0,0), -- Wildhammer Defender
+(@CGUID+127,21736,530,1,1,-3684.913,2151.809,77.52428,5.916666,180,0,0), -- Wildhammer Defender
+(@CGUID+128,21736,530,1,1,-3685.335,2149.279,77.75353,0,180,0,0), -- Wildhammer Defender
+(@CGUID+129,21736,530,1,1,-3919.766,1921.036,92.54476,4.031711,180,0,0), -- Wildhammer Defender
+(@CGUID+130,21736,530,1,1,-3681.641,2150.365,77.14637,0,180,0,0), -- Wildhammer Defender
+(@CGUID+131,21736,530,1,1,-3851.496,1983.194,95.47652,5.644573,180,0,0), -- Wildhammer Defender
+(@CGUID+132,21736,530,1,1,-3652.893,2115.456,73.87647,0.9098039,180,0,0), -- Wildhammer Defender
+(@CGUID+133,21736,530,1,1,-3650.388,2119.66,74.10852,5.794493,180,0,0), -- Wildhammer Defender
+(@CGUID+134,21736,530,1,1,-3682.161,2078.713,79.58833,0,180,0,0), -- Wildhammer Defender
+(@CGUID+135,21736,530,1,1,-3786.782,2048.396,91.21173,0.1006334,180,0,0), -- Wildhammer Defender
+(@CGUID+136,21736,530,1,1,-3784.837,2049.612,90.97636,0,180,0,0), -- Wildhammer Defender
+(@CGUID+137,21736,530,1,1,-3782.777,2052.594,90.72334,6.265732,180,0,0), -- Wildhammer Defender
+(@CGUID+138,21736,530,1,1,-3717.93,2119.383,79.23235,0.3316126,180,0,0), -- Wildhammer Defender
+(@CGUID+139,21736,530,1,1,-3714.138,2114.775,78.9608,0,180,0,0), -- Wildhammer Defender
+(@CGUID+140,21736,530,1,1,-3718.753,2114.669,79.09962,0,180,0,0), -- Wildhammer Defender
+(@CGUID+141,21736,530,1,1,-3749.699,1947.884,96.39548,0,180,0,0), -- Wildhammer Defender
+(@CGUID+142,21736,530,1,1,-3750.445,1952.496,95.58738,0.6108652,180,0,0), -- Wildhammer Defender
+(@CGUID+143,21736,530,1,1,-3850.193,2248.611,96.63623,0.4399793,180,0,0), -- Wildhammer Defender
+(@CGUID+144,21736,530,1,1,-3843.343,2325.269,133.095,5.538298,180,0,0), -- Wildhammer Defender
+(@CGUID+145,21736,530,1,1,-3844.593,2322.037,131.8008,0.05431209,180,0,0), -- Wildhammer Defender
+(@CGUID+146,21736,530,1,1,-3717.634,2144.388,78.5683,4.834562,180,0,0), -- Wildhammer Defender
+(@CGUID+147,21736,530,1,1,-3842.376,2318.644,130.5374,0,180,0,0), -- Wildhammer Defender
+(@CGUID+148,21736,530,1,1,-3685.119,2087.13,78.97183,0,180,0,0), -- Wildhammer Defender
+(@CGUID+149,21736,530,1,1,-3684.643,2082.528,79.12675,0,180,0,0), -- Wildhammer Defender
+(@CGUID+150,21736,530,1,1,-3753.192,1981.282,89.36153,0,180,0,0), -- Wildhammer Defender
+(@CGUID+151,21736,530,1,1,-3978.54,1982.714,96.86301,5.148721,180,0,0), -- Wildhammer Defender
+(@CGUID+152,21736,530,1,1,-3981.715,1983.76,96.59644,4.014257,180,0,0), -- Wildhammer Defender
+(@CGUID+153,21736,530,1,1,-3947.176,1920.292,94.74855,3.996685,180,0,0), -- Wildhammer Defender
+(@CGUID+154,21736,530,1,1,-3950.263,1919.675,95.24184,4.77955,180,0,0), -- Wildhammer Defender
+(@CGUID+155,21736,530,1,1,-3779.929,1946.84,94.35347,0,180,0,0), -- Wildhammer Defender
+(@CGUID+156,21736,530,1,1,-3784.462,1948.801,93.0182,0.597023,180,0,0), -- Wildhammer Defender
+(@CGUID+157,21736,530,1,1,-3748.736,1982.875,88.63882,6.222463,180,0,0), -- Wildhammer Defender
+(@CGUID+158,21736,530,1,1,-3750,1986.581,88.09433,5.497787,180,0,0), -- Wildhammer Defender
+(@CGUID+159,21736,530,1,1,-3787.394,2080.842,87.94399,0.4982823,180,0,0), -- Wildhammer Defender
+(@CGUID+160,21736,530,1,1,-3783.194,2078.478,86.87587,1.639501,180,0,0), -- Wildhammer Defender
+(@CGUID+161,21736,530,1,1,-3782.318,1916.496,97.61156,6.229387,180,0,0), -- Wildhammer Defender
+(@CGUID+162,21736,530,1,1,-3782.483,1921.904,96.73063,4.389804,180,0,0), -- Wildhammer Defender
+(@CGUID+163,21736,530,1,1,-3984.229,1987.553,96.01703,3.961897,180,0,0), -- Wildhammer Defender
+(@CGUID+164,21736,530,1,1,-3847.891,2111.237,95.10791,0,180,0,0), -- Wildhammer Defender
+(@CGUID+165,21736,530,1,1,-3848.869,2121.906,95.14799,0.01745329,180,0,0), -- Wildhammer Defender
+(@CGUID+166,21736,530,1,1,-3848.543,2116.879,95.17249,0,180,0,0), -- Wildhammer Defender
+(@CGUID+167,21736,530,1,1,-3913.505,1951.79,94.37555,6.214606,180,0,0), -- Wildhammer Defender
+(@CGUID+168,21736,530,1,1,-3920.375,1951.794,93.7829,4.171337,180,0,0), -- Wildhammer Defender
+(@CGUID+169,21736,530,1,1,-3850.317,1953.731,94.92426,0,180,0,0), -- Wildhammer Defender
+(@CGUID+170,21736,530,1,1,-3850.647,1949.476,93.81782,0.6647981,180,0,0), -- Wildhammer Defender
+(@CGUID+171,21736,530,1,1,-4016.164,1984.24,91.07103,3.857178,180,0,0), -- Wildhammer Defender
+(@CGUID+172,21736,530,1,1,-4013.179,1984.284,92.1228,4.729842,180,0,0), -- Wildhammer Defender
+(@CGUID+173,21736,530,1,1,-4017.418,1985.021,90.86298,5.433104,180,0,0), -- Wildhammer Defender
+(@CGUID+174,21736,530,1,1,-3847.542,2020.757,95.21101,0,180,0,0), -- Wildhammer Defender
+(@CGUID+175,21736,530,1,1,-3853.918,1981.766,95.46375,0,180,0,0), -- Wildhammer Defender
+(@CGUID+176,21736,530,1,1,-3851.236,1950.459,94.24946,0.4094654,180,0,0), -- Wildhammer Defender
+(@CGUID+177,21736,530,1,1,-3985.56,1952.848,94.30185,5.224813,180,0,0), -- Wildhammer Defender
+(@CGUID+178,21736,530,1,1,-3983.166,1951.212,94.62326,4.537856,180,0,0), -- Wildhammer Defender
+(@CGUID+179,21736,530,1,1,-3825.603,2117.511,92.3006,0,180,0,0), -- Wildhammer Defender
+(@CGUID+180,21736,530,1,1,-3825.355,2122.993,93.42735,6.038839,180,0,0), -- Wildhammer Defender
+(@CGUID+181,21736,530,1,1,-3852.294,2014.958,95.09501,0,180,0,0), -- Wildhammer Defender
+(@CGUID+182,21736,530,1,1,-3849.631,2016.781,95.22775,5.462881,180,0,0), -- Wildhammer Defender
+(@CGUID+183,21736,530,1,1,-3820.566,2126.727,93.36005,0,180,0,0), -- Wildhammer Defender
+(@CGUID+184,21736,530,1,1,-3784.549,2280.514,83.04472,0.2174243,180,0,0), -- Wildhammer Defender
+(@CGUID+185,21736,530,1,1,-3880.888,2292.529,136.8643,0,180,0,0), -- Wildhammer Defender
+(@CGUID+186,21736,530,1,1,-3881.622,2298.126,135.9386,5.51524,180,0,0), -- Wildhammer Defender
+(@CGUID+187,21736,530,1,1,-3882.953,2295.41,136.6266,0,180,0,0), -- Wildhammer Defender
+(@CGUID+188,21736,530,1,1,-3884.247,2011.731,95.17823,0,180,0,0), -- Wildhammer Defender
+(@CGUID+189,21736,530,1,1,-3879.029,2017.401,95.56957,4.131869,180,0,0), -- Wildhammer Defender
+(@CGUID+190,21736,530,1,1,-3883.854,2016.748,95.31251,6.073746,180,0,0), -- Wildhammer Defender
+(@CGUID+191,21736,530,1,1,-3883.628,1983.258,98.18201,0,180,0,0), -- Wildhammer Defender
+(@CGUID+192,21736,530,1,1,-3880.302,1988.198,97.16907,0,180,0,0), -- Wildhammer Defender
+(@CGUID+193,21736,530,1,1,-3886.859,1983.715,98.51514,0.7948366,180,0,0), -- Wildhammer Defender
+(@CGUID+194,21736,530,1,1,-3718.878,2080.067,79.86791,0,180,0,0), -- Wildhammer Defender
+(@CGUID+195,21736,530,1,1,-3815.645,2286.567,91.33823,5.082875,180,0,0), -- Wildhammer Defender
+(@CGUID+196,21736,530,1,1,-3816.484,2282.411,91.13193,0.02319094,180,0,0), -- Wildhammer Defender
+(@CGUID+197,21736,530,1,1,-3818.956,2287.277,92.45591,5.507541,180,0,0), -- Wildhammer Defender
+(@CGUID+198,21736,530,1,1,-3950.783,1952.535,93.83051,4.799655,180,0,0), -- Wildhammer Defender
+(@CGUID+199,21736,530,1,1,-3953.534,1951.763,94.13914,5.381426,180,0,0), -- Wildhammer Defender
+(@CGUID+200,21736,530,1,1,-3949.221,1952.466,93.86645,4.36705,180,0,0), -- Wildhammer Defender
+(@CGUID+201,21736,530,1,1,-3781.529,2285.769,82.5744,5.010948,180,0,0), -- Wildhammer Defender
+(@CGUID+202,21736,530,1,1,-3817.672,2048.626,94.64027,0.01461005,180,0,0), -- Wildhammer Defender
+(@CGUID+203,21736,530,1,1,-3815.462,2051.215,94.52544,0,180,0,0), -- Wildhammer Defender
+(@CGUID+204,21736,530,1,1,-3812.998,2052.776,94.77722,0,180,0,0), -- Wildhammer Defender
+(@CGUID+205,21736,530,1,1,-3917.135,1950.396,93.87897,4.747295,180,0,0), -- Wildhammer Defender
+(@CGUID+206,21736,530,1,1,-3847.084,2215.741,93.87874,0,180,0,0), -- Wildhammer Defender
+(@CGUID+207,21736,530,1,1,-3852.238,2220.79,94.36859,5.591657,180,0,0), -- Wildhammer Defender
+(@CGUID+208,21736,530,1,1,-3784.764,2154.447,81.39611,0,180,0,0), -- Wildhammer Defender
+(@CGUID+209,21736,530,1,1,-3788.006,2159.026,82.30029,0,180,0,0), -- Wildhammer Defender
+(@CGUID+210,21736,530,1,1,-3781.759,2150.456,80.16541,0,180,0,0), -- Wildhammer Defender
+(@CGUID+211,21736,530,1,1,-3783.998,2186.586,81.37851,0,180,0,0), -- Wildhammer Defender
+(@CGUID+212,21736,530,1,1,-3819.335,2185.379,90.92764,5.969026,180,0,0), -- Wildhammer Defender
+(@CGUID+213,21736,530,1,1,-3817.734,2181.533,91.11926,0,180,0,0), -- Wildhammer Defender
+(@CGUID+214,21736,530,1,1,-3820.374,2178.931,92.13614,0,180,0,0), -- Wildhammer Defender
+(@CGUID+215,21736,530,1,1,-3886.752,1949.355,98.68501,0,180,0,0), -- Wildhammer Defender
+(@CGUID+216,21736,530,1,1,-3682.023,2184.705,76.14991,0,180,0,0), -- Wildhammer Defender
+(@CGUID+217,21749,530,1,1,-3248.491,2555.041,63.95412,2.775074,180,0,0), -- Shadowmoon Scout
+(@CGUID+218,21749,530,1,1,-3246.358,2545.461,63.66066,3.525565,180,0,0), -- Shadowmoon Scout
+(@CGUID+219,21749,530,1,1,-3246.619,2549.447,63.67701,3.071779,180,0,0), -- Shadowmoon Scout
+(@CGUID+220,21749,530,1,1,-3181.337,2478.907,62.32787,4.520403,180,0,0), -- Shadowmoon Scout
+(@CGUID+221,21749,530,1,1,-3184.982,2486.061,62.6601,3.164761,180,0,0), -- Shadowmoon Scout
+(@CGUID+222,21749,530,1,1,-3284.342,2445.198,64.40284,4.118977,180,0,0), -- Shadowmoon Scout
+(@CGUID+223,21749,530,1,1,-3283.268,2451.874,65.02358,2.548181,180,0,0), -- Shadowmoon Scout
+(@CGUID+224,21749,530,1,1,-3281.779,2448.098,64.90981,3.228859,180,0,0), -- Shadowmoon Scout
+(@CGUID+225,21749,530,1,1,-3249.78,2520.571,64.08709,5.345082,180,0,0), -- Shadowmoon Scout
+(@CGUID+226,21749,530,1,1,-3213.95,2584.836,63.73072,0.6197953,180,0,0), -- Shadowmoon Scout
+(@CGUID+227,21749,530,1,1,-3214.302,2585.415,63.73072,0.4691313,180,0,0), -- Shadowmoon Scout
+(@CGUID+228,21749,530,1,1,-3212.574,2584.167,63.73072,4.104078,180,0,0), -- Shadowmoon Scout
+(@CGUID+229,21749,530,1,1,-3283.038,2418.76,61.61648,4.396026,180,0,0), -- Shadowmoon Scout
+(@CGUID+230,21749,530,1,1,-3251.176,2514.979,63.52509,0.4636233,180,0,0), -- Shadowmoon Scout
+(@CGUID+231,21749,530,1,1,-2985.587,2717.226,69.77036,2.443461,180,0,0), -- Shadowmoon Scout
+(@CGUID+232,21749,530,1,1,-2981.45,2719.4,70.41756,3.984792,180,0,0), -- Shadowmoon Scout
+(@CGUID+233,21749,530,1,1,-3145.995,2348.046,59.63594,4.817109,180,0,0), -- Shadowmoon Scout
+(@CGUID+234,21749,530,1,1,-3151.249,2349.226,60.02248,3.473205,180,0,0), -- Shadowmoon Scout
+(@CGUID+235,21749,530,1,1,-3252.101,2384.09,62.56363,3.595378,180,0,0), -- Shadowmoon Scout
+(@CGUID+236,21749,530,1,1,-3250.9,2380.641,62.54044,5.026548,180,0,0), -- Shadowmoon Scout
+(@CGUID+237,21749,530,1,1,-3219.261,2651.724,63.47577,2.583087,180,0,0), -- Shadowmoon Scout
+(@CGUID+238,21749,530,1,1,-3186.194,2319.137,63.55861,4.415683,180,0,0), -- Shadowmoon Scout
+(@CGUID+239,21749,530,1,1,-3281.876,2416.862,61.20646,3.682645,180,0,0), -- Shadowmoon Scout
+(@CGUID+240,21749,530,1,1,-3211.26,2481.643,58.08942,2.704427,180,0,0), -- Shadowmoon Scout
+(@CGUID+241,21749,530,1,1,-3214.337,2613.262,63.26073,3.735005,180,0,0), -- Shadowmoon Scout
+(@CGUID+242,21749,530,1,1,-3218.534,2386.454,61.91229,2.338741,180,0,0), -- Shadowmoon Scout
+(@CGUID+243,21749,530,1,1,-3250.816,2420.065,61.51332,2.268928,180,0,0), -- Shadowmoon Scout
+(@CGUID+244,21749,530,1,1,-3247.836,2413.42,62.38974,4.313396,180,0,0), -- Shadowmoon Scout
+(@CGUID+245,21749,530,1,1,-3019.602,2687.629,64.67725,2.984513,180,0,0), -- Shadowmoon Scout
+(@CGUID+246,21749,530,1,1,-3012.504,2751.895,71.38201,3.516591,180,0,0), -- Shadowmoon Scout
+(@CGUID+247,21749,530,1,1,-3149.503,2483.526,62.22206,3.159046,180,0,0), -- Shadowmoon Scout
+(@CGUID+248,21749,530,1,1,-3150.068,2479.767,62.23223,3.944444,180,0,0), -- Shadowmoon Scout
+(@CGUID+249,21749,530,1,1,-3214.619,2618.291,62.77502,1.745329,180,0,0), -- Shadowmoon Scout
+(@CGUID+250,21749,530,1,1,-3151.628,2487.376,62.17052,2.408554,180,0,0), -- Shadowmoon Scout
+(@CGUID+251,21749,530,1,1,-3215.219,2414.577,62.54089,3.339763,180,0,0), -- Shadowmoon Scout
+(@CGUID+252,21749,530,1,1,-3218.053,2615.263,62.63012,2.495821,180,0,0), -- Shadowmoon Scout
+(@CGUID+253,21749,530,1,1,-3120.845,2684.475,59.8312,1.989675,180,0,0), -- Shadowmoon Scout
+(@CGUID+254,21749,530,1,1,-3051.346,2751.043,69.28691,3.281219,180,0,0), -- Shadowmoon Scout
+(@CGUID+255,21749,530,1,1,-3123.479,2679.836,60.34409,3.159046,180,0,0), -- Shadowmoon Scout
+(@CGUID+256,21749,530,1,1,-3219.938,2522.659,64.03721,2.670354,180,0,0), -- Shadowmoon Scout
+(@CGUID+257,21749,530,1,1,-3248.943,2416.599,61.7177,3.573893,180,0,0), -- Shadowmoon Scout
+(@CGUID+258,21749,530,1,1,-3046.588,2750.142,69.08405,2.408554,180,0,0), -- Shadowmoon Scout
+(@CGUID+259,21749,530,1,1,-3214.326,2515.346,62.27526,4.066617,180,0,0), -- Shadowmoon Scout
+(@CGUID+260,21749,530,1,1,-3148.202,2352.589,59.13564,3.001966,180,0,0), -- Shadowmoon Scout
+(@CGUID+261,21749,530,1,1,-3052.384,2685.449,63.52053,2.094395,180,0,0), -- Shadowmoon Scout
+(@CGUID+262,21749,530,1,1,-3214.131,2646.38,63.62086,0.715585,180,0,0), -- Shadowmoon Scout
+(@CGUID+263,21749,530,1,1,-3182.529,2379.631,62.08411,2.104391,180,0,0), -- Shadowmoon Scout
+(@CGUID+264,21749,530,1,1,-3015.408,2748.637,70.10625,2.303835,180,0,0), -- Shadowmoon Scout
+(@CGUID+265,21749,530,1,1,-3217.239,2354.241,62.32437,5.457121,180,0,0), -- Shadowmoon Scout
+(@CGUID+266,21749,530,1,1,-3219.823,2417.87,62.53999,5.313572,180,0,0), -- Shadowmoon Scout
+(@CGUID+267,21749,530,1,1,-3213.728,2353.163,62.48506,5.305801,180,0,0), -- Shadowmoon Scout
+(@CGUID+268,21749,530,1,1,-3250.017,2350.693,61.18288,2.286381,180,0,0), -- Shadowmoon Scout
+(@CGUID+269,21749,530,1,1,-3215.427,2649.632,63.55902,1.815142,180,0,0), -- Shadowmoon Scout
+(@CGUID+270,21749,530,1,1,-3147.54,2648.191,62.73973,1.884956,180,0,0), -- Shadowmoon Scout
+(@CGUID+271,21749,530,1,1,-3147.035,2652.735,62.39242,1.256637,180,0,0), -- Shadowmoon Scout
+(@CGUID+272,21749,530,1,1,-3016.828,2686.557,65.27979,1.53589,180,0,0), -- Shadowmoon Scout
+(@CGUID+273,21749,530,1,1,-3047.519,2684.599,63.55605,1.745329,180,0,0), -- Shadowmoon Scout
+(@CGUID+274,21749,530,1,1,-3084.918,2682.301,61.88135,2.251475,180,0,0), -- Shadowmoon Scout
+(@CGUID+275,21749,530,1,1,-3212.988,2553.251,61.72695,1.710423,180,0,0), -- Shadowmoon Scout
+(@CGUID+276,21749,530,1,1,-3208.576,2548.291,61.72695,5.622009,180,0,0), -- Shadowmoon Scout
+(@CGUID+277,21749,530,1,1,-3208.223,2552.288,61.69617,5.096361,180,0,0), -- Shadowmoon Scout
+(@CGUID+278,21749,530,1,1,-3088.507,2682.017,61.98051,1.09016,180,0,0), -- Shadowmoon Scout
+(@CGUID+279,21749,530,1,1,-3247.273,2583.69,61.84106,3.159046,180,0,0), -- Shadowmoon Scout
+(@CGUID+280,21749,530,1,1,-3014.316,2719.081,67.58778,1.570796,180,0,0), -- Shadowmoon Scout
+(@CGUID+281,21749,530,1,1,-3018.557,2717.031,67.31898,2.216568,180,0,0), -- Shadowmoon Scout
+(@CGUID+282,21749,530,1,1,-3021.013,2714.105,66.93269,0.3085006,180,0,0), -- Shadowmoon Scout
+(@CGUID+283,21749,530,1,1,-3186.119,2416.528,64.45804,3.822271,180,0,0), -- Shadowmoon Scout
+(@CGUID+284,21749,530,1,1,-3183.559,2417.407,65.04218,3.379998,180,0,0), -- Shadowmoon Scout
+(@CGUID+285,21749,530,1,1,-3117.414,2655.364,61.83828,1.919862,180,0,0), -- Shadowmoon Scout
+(@CGUID+286,21749,530,1,1,-3120.921,2650.658,61.90579,3.735005,180,0,0), -- Shadowmoon Scout
+(@CGUID+287,21749,530,1,1,-3118.246,2651.884,61.83828,2.408554,180,0,0), -- Shadowmoon Scout
+(@CGUID+288,21749,530,1,1,-3152.983,2381.097,62.69644,4.677482,180,0,0), -- Shadowmoon Scout
+(@CGUID+289,21749,530,1,1,-3148.177,2380.82,61.52073,5.183628,180,0,0), -- Shadowmoon Scout
+(@CGUID+290,21749,530,1,1,-3119.371,2716.554,63.11438,3.455752,180,0,0), -- Shadowmoon Scout
+(@CGUID+291,21749,530,1,1,-3113.059,2720.815,63.41604,1.48353,180,0,0), -- Shadowmoon Scout
+(@CGUID+292,21749,530,1,1,-3115.244,2716.707,62.54544,2.356194,180,0,0), -- Shadowmoon Scout
+(@CGUID+293,21749,530,1,1,-3248.238,2320.338,62.92954,1.256637,180,0,0), -- Shadowmoon Scout
+(@CGUID+294,21749,530,1,1,-3250.768,2646.786,60.25401,0.8820428,180,0,0), -- Shadowmoon Scout
+(@CGUID+295,21749,530,1,1,-3180.963,2545.823,62.26253,4.869469,180,0,0), -- Shadowmoon Scout
+(@CGUID+296,21749,530,1,1,-3184.685,2547.756,61.54413,3.735005,180,0,0), -- Shadowmoon Scout
+(@CGUID+297,21749,530,1,1,-3248.129,2346.422,61.39072,4.677482,180,0,0), -- Shadowmoon Scout
+(@CGUID+298,21749,530,1,1,-3253.989,2387.43,62.51873,2.827433,180,0,0), -- Shadowmoon Scout
+(@CGUID+299,21749,530,1,1,-3137.041,2621.018,61.84888,2.635447,180,0,0), -- Shadowmoon Scout
+(@CGUID+300,21749,530,1,1,-3132.074,2623.679,61.95567,1.37881,180,0,0), -- Shadowmoon Scout
+(@CGUID+301,21749,530,1,1,-3133.537,2620.497,61.85756,2.042035,180,0,0), -- Shadowmoon Scout
+(@CGUID+302,21749,530,1,1,-3116.245,2685.862,60.43201,1.343904,180,0,0), -- Shadowmoon Scout
+(@CGUID+303,21749,530,1,1,-3186.654,2420.527,65.49627,2.9147,180,0,0), -- Shadowmoon Scout
+(@CGUID+304,21749,530,1,1,-3214.692,2487.305,58.30044,2.426008,180,0,0), -- Shadowmoon Scout
+(@CGUID+305,21749,530,1,1,-3249.573,2520.175,63.80834,2.220184,180,0,0), -- Shadowmoon Scout
+(@CGUID+306,21749,530,1,1,-3153.019,2647.777,62.72741,0.4449092,180,0,0), -- Shadowmoon Scout
+(@CGUID+307,21749,530,1,1,-3183.179,2323.693,63.30153,2.86234,180,0,0), -- Shadowmoon Scout
+(@CGUID+308,21749,530,1,1,-2982.575,2713.413,69.8224,3.228859,180,0,0), -- Shadowmoon Scout
+(@CGUID+309,21749,530,1,1,-3249.656,2580.033,61.93226,3.822271,180,0,0), -- Shadowmoon Scout
+(@CGUID+310,21749,530,1,1,-3153.712,2385.177,62.89458,3.630285,180,0,0), -- Shadowmoon Scout
+(@CGUID+311,21749,530,1,1,-3180.493,2384.361,61.8433,5.427974,180,0,0), -- Shadowmoon Scout
+(@CGUID+312,21749,530,1,1,-3018.864,2746.905,69.35901,2.792527,180,0,0), -- Shadowmoon Scout
+(@CGUID+313,21749,530,1,1,-3213.8,2346.804,62.42208,4.08407,180,0,0), -- Shadowmoon Scout
+(@CGUID+314,21749,530,1,1,-3084.45,2688.924,62.26373,1.64061,180,0,0), -- Shadowmoon Scout
+(@CGUID+315,21749,530,1,1,-3247.638,2646.158,60.59602,1.66291,180,0,0), -- Shadowmoon Scout
+(@CGUID+316,21749,530,1,1,-3248.504,2317.056,63.49638,5.009095,180,0,0), -- Shadowmoon Scout
+(@CGUID+317,21749,530,1,1,-3182.068,2520.25,62.95838,2.321288,180,0,0), -- Shadowmoon Scout
+(@CGUID+318,21749,530,1,1,-3185.56,2348.931,62.99499,4.625123,180,0,0), -- Shadowmoon Scout
+(@CGUID+319,21749,530,1,1,-3181.815,2351.654,63.59208,5.61996,180,0,0), -- Shadowmoon Scout
+(@CGUID+320,21749,530,1,1,-3188.798,2352.033,63.12336,0.2365346,180,0,0), -- Shadowmoon Scout
+(@CGUID+321,21749,530,1,1,-3215.527,2322.648,62.43359,4.171337,180,0,0), -- Shadowmoon Scout
+(@CGUID+322,21749,530,1,1,-3219.714,2319.087,62.8676,3.281219,180,0,0), -- Shadowmoon Scout
+(@CGUID+323,21749,530,1,1,-3212.782,2318.2,62.63361,5.288348,180,0,0), -- Shadowmoon Scout
+(@CGUID+324,21749,530,1,1,-3250.121,2587.224,61.93335,4.542236,180,0,0), -- Shadowmoon Scout
+(@CGUID+325,21749,530,1,1,-3253.003,2319.524,63.04595,3.543018,180,0,0), -- Shadowmoon Scout
+(@CGUID+326,21749,530,1,1,-3151.217,2513.736,62.13049,2.477372,180,0,0), -- Shadowmoon Scout
+(@CGUID+327,21749,530,1,1,-3150.833,2518.689,62.21344,3.649299,180,0,0), -- Shadowmoon Scout
+(@CGUID+328,21749,530,1,1,-3216.713,2417.26,62.46391,3.612832,180,0,0), -- Shadowmoon Scout
+(@CGUID+329,21749,530,1,1,-3015.373,2688.583,65.18481,2.936295,180,0,0), -- Shadowmoon Scout
+(@CGUID+330,21749,530,1,1,-3187.142,2553.04,62.49031,2.740167,180,0,0), -- Shadowmoon Scout
+(@CGUID+331,21749,530,1,1,-3150.756,2516.487,62.20079,3.345201,180,0,0), -- Shadowmoon Scout
+(@CGUID+332,21749,530,1,1,-3047.298,2753.927,70.69917,1.308997,180,0,0), -- Shadowmoon Scout
+(@CGUID+333,21749,530,1,1,-3183.844,2512.93,63.18955,4.415683,180,0,0), -- Shadowmoon Scout
+(@CGUID+334,21749,530,1,1,-3187.319,2518.06,63.21768,3.577925,180,0,0), -- Shadowmoon Scout
+(@CGUID+335,21749,530,1,1,-3216.187,2380.604,61.83775,5.462881,180,0,0), -- Shadowmoon Scout
+(@CGUID+336,21749,530,1,1,-3054.542,2681.465,63.44939,2.80998,180,0,0), -- Shadowmoon Scout
+(@CGUID+337,21749,530,1,1,-3251.697,2619.894,61.61194,3.59085,180,0,0), -- Shadowmoon Scout
+(@CGUID+338,21749,530,1,1,-3252.181,2616.134,61.72932,3.089233,180,0,0), -- Shadowmoon Scout
+(@CGUID+339,21749,530,1,1,-3254.251,2613.699,61.75219,1.910519,180,0,0), -- Shadowmoon Scout
+(@CGUID+340,21749,530,1,1,-3145.872,2682.904,60.35411,6.005824,180,0,0), -- Shadowmoon Scout
+(@CGUID+341,21749,530,1,1,-3153.566,2681.806,62.16442,0.5180383,180,0,0), -- Shadowmoon Scout
+(@CGUID+342,21749,530,1,1,-3147.095,2687.623,61.06395,4.085599,180,0,0), -- Shadowmoon Scout
+(@CGUID+343,21749,530,1,1,-3279.984,2415.292,60.90798,3.310033,180,0,0), -- Shadowmoon Scout
+(@CGUID+344,21749,530,1,1,-3184.604,2482.996,62.56856,4.08407,180,0,0), -- Shadowmoon Scout
+(@CGUID+345,21749,530,1,1,-3216.976,2383.44,61.853,3.822271,180,0,0); -- Shadowmoon Scout
+
+DELETE FROM creature WHERE guid BETWEEN 74948 AND 74974;
+DELETE FROM creature WHERE guid BETWEEN 74976 AND 75103;
+DELETE FROM creature WHERE guid BETWEEN 75958 AND 75971;
+DELETE FROM creature WHERE guid BETWEEN 76000 AND 76062;
+DELETE FROM creature_addon WHERE guid BETWEEN 74948 AND 74974;
+DELETE FROM creature_addon WHERE guid BETWEEN 74976 AND 75103;
+DELETE FROM creature_addon WHERE guid BETWEEN 75958 AND 75971;
+DELETE FROM creature_addon WHERE guid BETWEEN 76000 AND 76062;
+UPDATE `creature_template_addon` SET `emote`=333 WHERE `entry` IN (21736,21749);
+
+-- Infernal Attacker SAI
+SET @ENTRY := 21419;
+UPDATE `creature_template` SET `unit_flags`=34212096, `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,3,0,20577,0,0,0,0,1,0,0,0,0,0,0,0,"Infernal Attacker - On spawn - Set model"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Infernal Attacker - On spawn - Set random movement"),
+(@ENTRY,0,2,3,8,0,100,0,37277,0,0,0,3,0,17312,0,0,0,0,1,0,0,0,0,0,0,0,"Infernal Attacker - On Spellhit - Set model"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,19,33685760,0,0,0,0,0,1,0,0,0,0,0,0,0,"Infernal Attacker - On Spellhit - Remove unit_flags");
diff --git a/sql/updates/world/2014_09_20_05_world_conditions.sql b/sql/updates/world/2014_09_20_05_world_conditions.sql
new file mode 100644
index 00000000000..f5f0308bf70
--- /dev/null
+++ b/sql/updates/world/2014_09_20_05_world_conditions.sql
@@ -0,0 +1 @@
+UPDATE `conditions` SET `ConditionTypeOrReference`=28 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7967 AND `SourceEntry`=4 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=9 AND `ConditionTarget`=0 AND `ConditionValue1`=10242 AND `ConditionValue2`=0 AND `ConditionValue3`=0;
diff --git a/sql/updates/world/2014_09_21_00_world_spell_dbc.sql b/sql/updates/world/2014_09_21_00_world_spell_dbc.sql
new file mode 100644
index 00000000000..d762bf92107
--- /dev/null
+++ b/sql/updates/world/2014_09_21_00_world_spell_dbc.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `spell_dbc` ADD `EffectItemType1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `EffectMultipleValue3`;
+ALTER TABLE `spell_dbc` ADD `EffectItemType2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `EffectItemType1`;
+ALTER TABLE `spell_dbc` ADD `EffectItemType3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `EffectItemType2`;
+
+UPDATE `spell_dbc` SET `EffectItemType1`=30616 WHERE `Id`=37064;
diff --git a/sql/updates/world/2014_09_21_00_world_spell_dbc_434.sql b/sql/updates/world/2014_09_21_00_world_spell_dbc_434.sql
new file mode 100644
index 00000000000..62199ab05b9
--- /dev/null
+++ b/sql/updates/world/2014_09_21_00_world_spell_dbc_434.sql
@@ -0,0 +1 @@
+ALTER TABLE `spelleffect_dbc` ADD `EffectItemType` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `EffectDieSides`;
diff --git a/sql/updates/world/2014_09_21_01_world_spell_dbc.sql b/sql/updates/world/2014_09_21_01_world_spell_dbc.sql
new file mode 100644
index 00000000000..55b02edfc59
--- /dev/null
+++ b/sql/updates/world/2014_09_21_01_world_spell_dbc.sql
@@ -0,0 +1,213 @@
+UPDATE `spell_dbc` SET `EffectItemType1` = 11522 WHERE `Id` = 13909;
+UPDATE `spell_dbc` SET `EffectItemType1` = 12563 WHERE `Id` = 16548;
+UPDATE `spell_dbc` SET `EffectItemType1` = 16787 WHERE `Id` = 20693;
+UPDATE `spell_dbc` SET `EffectItemType1` = 8051 WHERE `Id` = 22190;
+UPDATE `spell_dbc` SET `EffectItemType1` = 2756 WHERE `Id` = 22208;
+UPDATE `spell_dbc` SET `EffectItemType1` = 2757 WHERE `Id` = 22209;
+UPDATE `spell_dbc` SET `EffectItemType1` = 2758 WHERE `Id` = 22210;
+UPDATE `spell_dbc` SET `EffectItemType1` = 2759 WHERE `Id` = 22211;
+UPDATE `spell_dbc` SET `EffectItemType1` = 7586 WHERE `Id` = 22837;
+UPDATE `spell_dbc` SET `EffectItemType1` = 18513 WHERE `Id` = 22925;
+UPDATE `spell_dbc` SET `EffectItemType1` = 11286 WHERE `Id` = 22941;
+UPDATE `spell_dbc` SET `EffectItemType1` = 15875 WHERE `Id` = 22942;
+UPDATE `spell_dbc` SET `EffectItemType1` = 8432 WHERE `Id` = 22943;
+UPDATE `spell_dbc` SET `EffectItemType1` = 8095 WHERE `Id` = 22944;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19016 WHERE `Id` = 22958;
+UPDATE `spell_dbc` SET `EffectItemType1` = 6265 WHERE `Id` = 23464;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19004 WHERE `Id` = 23518;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19005 WHERE `Id` = 23519;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19642 WHERE `Id` = 23975;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19574 WHERE `Id` = 23998;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19575 WHERE `Id` = 23999;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19576 WHERE `Id` = 24000;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19577 WHERE `Id` = 24001;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19579 WHERE `Id` = 24007;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19585 WHERE `Id` = 24008;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19586 WHERE `Id` = 24009;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19588 WHERE `Id` = 24010;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19591 WHERE `Id` = 24012;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19592 WHERE `Id` = 24013;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19593 WHERE `Id` = 24014;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19594 WHERE `Id` = 24015;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19598 WHERE `Id` = 24038;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19599 WHERE `Id` = 24039;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19600 WHERE `Id` = 24040;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19601 WHERE `Id` = 24041;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19602 WHERE `Id` = 24044;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19603 WHERE `Id` = 24045;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19604 WHERE `Id` = 24046;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19605 WHERE `Id` = 24047;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19610 WHERE `Id` = 24055;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19611 WHERE `Id` = 24056;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19612 WHERE `Id` = 24059;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19613 WHERE `Id` = 24060;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19606 WHERE `Id` = 24067;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19607 WHERE `Id` = 24068;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19608 WHERE `Id` = 24069;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19609 WHERE `Id` = 24070;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19614 WHERE `Id` = 24072;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19615 WHERE `Id` = 24073;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19616 WHERE `Id` = 24074;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19617 WHERE `Id` = 24075;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19618 WHERE `Id` = 24076;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19619 WHERE `Id` = 24077;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19620 WHERE `Id` = 24078;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19621 WHERE `Id` = 24079;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19974 WHERE `Id` = 24304;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20454 WHERE `Id` = 24805;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20455 WHERE `Id` = 24806;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20456 WHERE `Id` = 24807;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20371 WHERE `Id` = 24863;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20949 WHERE `Id` = 25600;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21109 WHERE `Id` = 25763;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21107 WHERE `Id` = 25764;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21106 WHERE `Id` = 25765;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21042 WHERE `Id` = 25784;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21136 WHERE `Id` = 25785;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21206 WHERE `Id` = 25921;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21207 WHERE `Id` = 25922;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21208 WHERE `Id` = 25923;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21209 WHERE `Id` = 25924;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21210 WHERE `Id` = 25925;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21201 WHERE `Id` = 25927;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21202 WHERE `Id` = 25928;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21203 WHERE `Id` = 25929;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21204 WHERE `Id` = 25930;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21205 WHERE `Id` = 25931;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21196 WHERE `Id` = 25932;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21197 WHERE `Id` = 25933;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21198 WHERE `Id` = 25934;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21199 WHERE `Id` = 25935;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21200 WHERE `Id` = 25936;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21816 WHERE `Id` = 26668;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21818 WHERE `Id` = 26670;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21819 WHERE `Id` = 26671;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21821 WHERE `Id` = 26672;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21823 WHERE `Id` = 26673;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21822 WHERE `Id` = 26674;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21820 WHERE `Id` = 26675;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21817 WHERE `Id` = 26676;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22114 WHERE `Id` = 26973;
+UPDATE `spell_dbc` SET `EffectItemType1` = 13583 WHERE `Id` = 26974;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22048 WHERE `Id` = 27537;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22047 WHERE `Id` = 27542;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21984 WHERE `Id` = 27544;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22050 WHERE `Id` = 27558;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22049 WHERE `Id` = 27560;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22052 WHERE `Id` = 27562;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22051 WHERE `Id` = 27563;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22056 WHERE `Id` = 27566;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22822 WHERE `Id` = 28532;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19822 WHERE `Id` = 28885;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19823 WHERE `Id` = 28886;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19824 WHERE `Id` = 28908;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19825 WHERE `Id` = 28909;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19826 WHERE `Id` = 28919;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19827 WHERE `Id` = 28920;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19831 WHERE `Id` = 28921;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19829 WHERE `Id` = 28923;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19830 WHERE `Id` = 28926;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19832 WHERE `Id` = 28929;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19833 WHERE `Id` = 28930;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19834 WHERE `Id` = 28935;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19835 WHERE `Id` = 28937;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19836 WHERE `Id` = 28939;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19838 WHERE `Id` = 28940;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19839 WHERE `Id` = 28941;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19840 WHERE `Id` = 28942;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19841 WHERE `Id` = 28943;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19842 WHERE `Id` = 28945;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19843 WHERE `Id` = 28946;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20034 WHERE `Id` = 28949;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19845 WHERE `Id` = 28951;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19846 WHERE `Id` = 28952;
+UPDATE `spell_dbc` SET `EffectItemType1` = 20033 WHERE `Id` = 28954;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19849 WHERE `Id` = 28956;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19848 WHERE `Id` = 28958;
+UPDATE `spell_dbc` SET `EffectItemType1` = 19828 WHERE `Id` = 28959;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21407 WHERE `Id` = 29009;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21409 WHERE `Id` = 29010;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21408 WHERE `Id` = 29011;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21401 WHERE `Id` = 29012;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21403 WHERE `Id` = 29013;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21402 WHERE `Id` = 29014;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21413 WHERE `Id` = 29015;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21415 WHERE `Id` = 29016;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21414 WHERE `Id` = 29017;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21395 WHERE `Id` = 29018;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21397 WHERE `Id` = 29019;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21396 WHERE `Id` = 29020;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21410 WHERE `Id` = 29021;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21412 WHERE `Id` = 29022;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21411 WHERE `Id` = 29023;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21404 WHERE `Id` = 29024;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21406 WHERE `Id` = 29025;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21405 WHERE `Id` = 29026;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21398 WHERE `Id` = 29027;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21400 WHERE `Id` = 29028;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21399 WHERE `Id` = 29030;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21416 WHERE `Id` = 29031;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21418 WHERE `Id` = 29032;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21417 WHERE `Id` = 29033;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21392 WHERE `Id` = 29034;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21394 WHERE `Id` = 29036;
+UPDATE `spell_dbc` SET `EffectItemType1` = 21393 WHERE `Id` = 29037;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23227 WHERE `Id` = 29156;
+UPDATE `spell_dbc` SET `EffectItemType1` = 13582 WHERE `Id` = 29344;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23442 WHERE `Id` = 29372;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23584 WHERE `Id` = 29827;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23585 WHERE `Id` = 29828;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23586 WHERE `Id` = 29829;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23614 WHERE `Id` = 29867;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23616 WHERE `Id` = 29868;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23705 WHERE `Id` = 30139;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23709 WHERE `Id` = 30182;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23710 WHERE `Id` = 30185;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23712 WHERE `Id` = 30186;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23713 WHERE `Id` = 30188;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23714 WHERE `Id` = 30189;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23716 WHERE `Id` = 30192;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23720 WHERE `Id` = 30193;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22575 WHERE `Id` = 30436;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22576 WHERE `Id` = 30438;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22577 WHERE `Id` = 30439;
+UPDATE `spell_dbc` SET `EffectItemType1` = 23895 WHERE `Id` = 30634;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24184 WHERE `Id` = 31251;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24226 WHERE `Id` = 31314;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24573 WHERE `Id` = 32152;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24538 WHERE `Id` = 32165;
+UPDATE `spell_dbc` SET `EffectItemType1` = 25840 WHERE `Id` = 32673;
+UPDATE `spell_dbc` SET `EffectItemType1` = 25853 WHERE `Id` = 32762;
+UPDATE `spell_dbc` SET `EffectItemType1` = 27317 WHERE `Id` = 33137;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24581 WHERE `Id` = 33766;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24579 WHERE `Id` = 33767;
+UPDATE `spell_dbc` SET `EffectItemType1` = 28132 WHERE `Id` = 33892;
+UPDATE `spell_dbc` SET `EffectItemType1` = 28132 WHERE `Id` = 33893;
+UPDATE `spell_dbc` SET `EffectItemType1` = 28048 WHERE `Id` = 34362;
+UPDATE `spell_dbc` SET `EffectItemType1` = 28784 WHERE `Id` = 34706;
+UPDATE `spell_dbc` SET `EffectItemType1` = 28455 WHERE `Id` = 35378;
+UPDATE `spell_dbc` SET `EffectItemType1` = 28455 WHERE `Id` = 35690;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30309 WHERE `Id` = 36377;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30499 WHERE `Id` = 36799;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30632 WHERE `Id` = 37084;
+UPDATE `spell_dbc` SET `EffectItemType1` = 29024 WHERE `Id` = 37085;
+UPDATE `spell_dbc` SET `EffectItemType1` = 29024 WHERE `Id` = 37086;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30639 WHERE `Id` = 37100;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30658 WHERE `Id` = 37244;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30659 WHERE `Id` = 37245;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30847 WHERE `Id` = 38005;
+UPDATE `spell_dbc` SET `EffectItemType1` = 31108 WHERE `Id` = 38172;
+UPDATE `spell_dbc` SET `EffectItemType1` = 31310 WHERE `Id` = 38251;
+UPDATE `spell_dbc` SET `EffectItemType1` = 30540 WHERE `Id` = 38255;
+UPDATE `spell_dbc` SET `EffectItemType1` = 22781 WHERE `Id` = 38656;
+UPDATE `spell_dbc` SET `EffectItemType1` = 31663 WHERE `Id` = 38786;
+UPDATE `spell_dbc` SET `EffectItemType1` = 24494 WHERE `Id` = 39118;
+UPDATE `spell_dbc` SET `EffectItemType1` = 31763 WHERE `Id` = 39203;
+UPDATE `spell_dbc` SET `EffectItemType1` = 31084 WHERE `Id` = 39336;
+UPDATE `spell_dbc` SET `EffectItemType1` = 32588 WHERE `Id` = 40550;
+UPDATE `spell_dbc` SET `EffectItemType1` = 32566 WHERE `Id` = 40551;
+UPDATE `spell_dbc` SET `EffectItemType1` = 32542 WHERE `Id` = 40552;
+UPDATE `spell_dbc` SET `EffectItemType2` = 24538 WHERE `Id` = 32059;
+UPDATE `spell_dbc` SET `EffectItemType2` = 24538 WHERE `Id` = 32068;
+UPDATE `spell_dbc` SET `EffectItemType2` = 24538 WHERE `Id` = 32075;
+UPDATE `spell_dbc` SET `EffectItemType2` = 24538 WHERE `Id` = 32081;
diff --git a/sql/updates/world/2014_09_21_02_world_creature.sql b/sql/updates/world/2014_09_21_02_world_creature.sql
new file mode 100644
index 00000000000..ef70d0ae347
--- /dev/null
+++ b/sql/updates/world/2014_09_21_02_world_creature.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (301113,301114) AND `id`=37967;
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index d7f1eb4fa30..b40b8c906f4 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -60,6 +60,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/Server
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
+ ${VALGRIND_INCLUDE_DIR}
)
add_executable(authserver
diff --git a/src/server/collision/CMakeLists.txt b/src/server/collision/CMakeLists.txt
index 378bd62a78a..1c5fcbee52e 100644
--- a/src/server/collision/CMakeLists.txt
+++ b/src/server/collision/CMakeLists.txt
@@ -76,6 +76,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/Maps
${CMAKE_CURRENT_SOURCE_DIR}/Models
${MYSQL_INCLUDE_DIR}
+ ${VALGRIND_INCLUDE_DIR}
)
add_library(collision STATIC
diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 1403049f6a0..0d1b460500e 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -204,6 +204,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
+ ${VALGRIND_INCLUDE_DIR}
)
add_library(game STATIC
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index e413828f286..3c2344c1d47 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -134,7 +134,7 @@ const std::string CustomSpellDifficultyIndex = "id";
char const SpellDurationfmt[] = "niii";
// 0 10 20 26
char const SpellEffectEntryfmt[] = "nifiiiffiiiiiifiifiiiiiiiix";
-const std::string CustomSpellEffectEntryfmt = "ppppppppppapppappppppppppp";
+const std::string CustomSpellEffectEntryfmt = "ppppppppppppppappppppppppp";
const std::string CustomSpellEffectEntryIndex = "Id";
// 0 10 20 30 40 47
char const SpellEntryfmt[] = "niiiiiiiiiiiiiiifiiiissxxiixxifiiiiiiixiiiiiiiix";
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 5d63844d946..0f670c3286a 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -19,8 +19,8 @@
#ifndef SC_SCRIPTMGR_H
#define SC_SCRIPTMGR_H
-#include <atomic>
#include "Common.h"
+#include <atomic>
#include "DBCStores.h"
#include "QuestDef.h"
#include "SharedDefines.h"
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 334920d9c8b..31c61cdf0e6 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -145,6 +145,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/game/World
${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
${MYSQL_INCLUDE_DIR}
+ ${VALGRIND_INCLUDE_DIR}
)
add_library(scripts STATIC
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index a61248f01ea..7a02e415d69 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -77,6 +77,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
+ ${VALGRIND_INCLUDE_DIR}
)
add_library(shared STATIC
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index 5d5da7e600e..2723d287c53 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -31,6 +31,11 @@
# if !defined(_GLIBCXX_USE_NANOSLEEP)
# define _GLIBCXX_USE_NANOSLEEP
# endif
+# if defined(HELGRIND)
+# include <valgrind/helgrind.h>
+# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_BEFORE(A) ANNOTATE_HAPPENS_BEFORE(A)
+# define _GLIBCXX_SYNCHRONIZATION_HAPPENS_AFTER(A) ANNOTATE_HAPPENS_AFTER(A)
+# endif
#endif
#include <cstddef>
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 6df8c52aa06..0cdf5f13f79 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -140,6 +140,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/TCSoap
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
+ ${VALGRIND_INCLUDE_DIR}
)
add_executable(worldserver