diff --git a/MapMethods.h b/MapMethods.h
index b1d27e0..8a55c63 100644
--- a/MapMethods.h
+++ b/MapMethods.h
@@ -259,19 +259,19 @@ namespace LuaMap
         uint32 weatherType = Eluna::CHECKVAL<uint32>(L, 3);
         float grade = Eluna::CHECKVAL<float>(L, 4);
 
-#if ((defined(CMANGOS) || defined(MANGOS)) && defined(WOTLK))
-        if (Weather::IsValidWeatherType(weatherType))
-            map->SetWeather(zoneId, (WeatherType)weatherType, grade, false);
-#else
-#ifdef TRINITY
+#if defined(TRINITY)
         Weather* weather = WeatherMgr::FindWeather(zoneId);
         if (!weather)
             weather = WeatherMgr::AddWeather(zoneId);
+        if (weather)
+            weather->SetWeather((WeatherType)weatherType, grade);
+#elif defined(CMANGOS) || defined(WOTLK)
+        if (Weather::IsValidWeatherType(weatherType))
+            map->SetWeather(zoneId, (WeatherType)weatherType, grade, false);
 #else
         Weather* weather = eWorld->FindWeather(zoneId);
         if (!weather)
             weather = eWorld->AddWeather(zoneId);
-#endif
         if (weather)
             weather->SetWeather((WeatherType)weatherType, grade);
 #endif
diff --git a/UnitMethods.h b/UnitMethods.h
index 5313d70..238b1f5 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -1741,6 +1741,8 @@ namespace LuaUnit
             unit->DealDamage(target, damage, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, durabilityloss);
 #ifdef TRINITY
             unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_HIT, 0);
+#elif defined(CMANGOS) && defined(WOTLK)
+            unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_NORMAL, 0);
 #else
             unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_NORMAL, 0);
 #endif
@@ -1777,6 +1779,8 @@ namespace LuaUnit
             unit->DealDamage(target, damage, NULL, DIRECT_DAMAGE, schoolmask, NULL, false);
 #ifdef TRINITY
             unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_HIT, 0);
+#elif defined(CMANGOS) && defined(WOTLK)
+            unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, schoolmask, damage, absorb, resist, VICTIMSTATE_NORMAL, 0);
 #else
             unit->SendAttackStateUpdate(HITINFO_NORMALSWING2, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_NORMAL, 0);
 #endif