9 files changed, 292 insertions, 295 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 21a15fa4f99..0b040fc519a 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -763,6 +763,9 @@ void SmartAI::SetCombatMove(bool on)
         }
         else
         {
+            if (me->HasUnitState(UNIT_STATE_CONFUSED_MOVE | UNIT_STATE_FLEEING_MOVE))
+                return;
+
             me->GetMotionMaster()->MovementExpired();
             me->GetMotionMaster()->Clear(true);
             me->StopMoving();
diff --git a/src/server/game/Accounts/RBAC.cpp b/src/server/game/Accounts/RBAC.cpp
index 54ef1a34766..74ff060636e 100644
--- a/src/server/game/Accounts/RBAC.cpp
+++ b/src/server/game/Accounts/RBAC.cpp
@@ -1,265 +1,265 @@
-/*
- * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "RBAC.h"
-#include "AccountMgr.h"
-#include "DatabaseEnv.h"
-#include "Log.h"
-
-namespace rbac
-{
-
-std::string GetDebugPermissionString(RBACPermissionContainer const& perms)
-{
-    std::string str = "";
-    if (!perms.empty())
-    {
-        std::ostringstream o;
-        RBACPermissionContainer::const_iterator itr = perms.begin();
-        o << (*itr);
-        for (++itr; itr != perms.end(); ++itr)
-            o << ", " << uint32(*itr);
-        str = o.str();
-    }
-
-    return str;
-}
-
-RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /* = 0*/)
-{
-    // Check if permission Id exists
-    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);
-    if (!perm)
-    {
-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_ID_DOES_NOT_EXISTS;
-    }
-
-    // Check if already added in denied list
-    if (HasDeniedPermission(permissionId))
-    {
-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in deny list",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_IN_DENIED_LIST;
-    }
-
-    // Already added?
-    if (HasGrantedPermission(permissionId))
-    {
-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already granted",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_CANT_ADD_ALREADY_ADDED;
-    }
-
-    AddGrantedPermission(permissionId);
-
-    // Do not save to db when loading data from DB (realmId = 0)
-    if (realmId)
-    {
-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        SavePermission(permissionId, true, realmId);
-        CalculateNewPermissions();
-    }
-    else
-        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-
-    return RBAC_OK;
-}
-
-RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /* = 0*/)
-{
-    // Check if permission Id exists
-    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);
-    if (!perm)
-    {
-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_ID_DOES_NOT_EXISTS;
-    }
-
-    // Check if already added in granted list
-    if (HasGrantedPermission(permissionId))
-    {
-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in grant list",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_IN_GRANTED_LIST;
-    }
-
-    // Already added?
-    if (HasDeniedPermission(permissionId))
-    {
-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already denied",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_CANT_ADD_ALREADY_ADDED;
-    }
-
-    AddDeniedPermission(permissionId);
-
-    // Do not save to db when loading data from DB (realmId = 0)
-    if (realmId)
-    {
-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        SavePermission(permissionId, false, realmId);
-        CalculateNewPermissions();
-    }
-    else
-        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-
-    return RBAC_OK;
-}
-
-void RBACData::SavePermission(uint32 permission, bool granted, int32 realmId)
-{
-    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_RBAC_ACCOUNT_PERMISSION);
-    stmt->setUInt32(0, GetId());
-    stmt->setUInt32(1, permission);
-    stmt->setBool(2, granted);
-    stmt->setInt32(3, realmId);
-    LoginDatabase.Execute(stmt);
-}
-
-RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId /* = 0*/)
-{
-    // Check if it's present in any list
-    if (!HasGrantedPermission(permissionId) && !HasDeniedPermission(permissionId))
-    {
-        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Not granted or revoked",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        return RBAC_CANT_REVOKE_NOT_IN_LIST;
-    }
-
-    RemoveGrantedPermission(permissionId);
-    RemoveDeniedPermission(permissionId);
-
-    // Do not save to db when loading data from DB (realmId = 0)
-    if (realmId)
-    {
-        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-        PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_PERMISSION);
-        stmt->setUInt32(0, GetId());
-        stmt->setUInt32(1, permissionId);
-        stmt->setInt32(2, realmId);
-        LoginDatabase.Execute(stmt);
-
-        CalculateNewPermissions();
-    }
-    else
-        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
-                       GetId(), GetName().c_str(), permissionId, realmId);
-
-    return RBAC_OK;
-}
-
-void RBACData::LoadFromDB()
-{
-    ClearData();
-
-    TC_LOG_DEBUG("rbac", "RBACData::LoadFromDB [Id: %u Name: %s]: Loading permissions", GetId(), GetName().c_str());
-    // Load account permissions (granted and denied) that affect current realm
-    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_PERMISSIONS);
-    stmt->setUInt32(0, GetId());
-    stmt->setInt32(1, GetRealmId());
-
-    PreparedQueryResult result = LoginDatabase.Query(stmt);
-    if (result)
-    {
-        do
-        {
-            Field* fields = result->Fetch();
-            if (fields[1].GetBool())
-                GrantPermission(fields[0].GetUInt32());
-            else
-                DenyPermission(fields[0].GetUInt32());
-        }
-        while (result->NextRow());
-    }
-
-    // Add default permissions
-    RBACPermissionContainer const& permissions = sAccountMgr->GetRBACDefaultPermissions(_secLevel);
-    for (RBACPermissionContainer::const_iterator itr = permissions.begin(); itr != permissions.end(); ++itr)
-        GrantPermission(*itr);
-
-    // Force calculation of permissions
-    CalculateNewPermissions();
-}
-
-void RBACData::CalculateNewPermissions()
-{
-    TC_LOG_TRACE("rbac", "RBACData::CalculateNewPermissions [Id: %u Name: %s]", GetId(), GetName().c_str());
-
-    // Get the list of granted permissions
-    _globalPerms = GetGrantedPermissions();
-    ExpandPermissions(_globalPerms);
-    RBACPermissionContainer revoked = GetDeniedPermissions();
-    ExpandPermissions(revoked);
-    RemovePermissions(_globalPerms, revoked);
-}
-
-void RBACData::AddPermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
-{
-    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
-        permsTo.insert(*itr);
-}
-
-void RBACData::RemovePermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
-{
-    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
-        permsTo.erase(*itr);
-}
-
-void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)
-{
-    RBACPermissionContainer toCheck = permissions;
-    permissions.clear();
-
-    while (!toCheck.empty())
-    {
-        // remove the permission from original list
-        uint32 permissionId = *toCheck.begin();
-        toCheck.erase(toCheck.begin());
-
-        RBACPermission const* permission = sAccountMgr->GetRBACPermission(permissionId);
-        if (!permission)
-            continue;
-
-        // insert into the final list (expanded list)
-        permissions.insert(permissionId);
-
-        // add all linked permissions (that are not already expanded) to the list of permissions to be checked
-        RBACPermissionContainer const& linkedPerms = permission->GetLinkedPermissions();
-        for (RBACPermissionContainer::const_iterator itr = linkedPerms.begin(); itr != linkedPerms.end(); ++itr)
-            if (permissions.find(*itr) == permissions.end())
-                toCheck.insert(*itr);
-    }
-
-    TC_LOG_DEBUG("rbac", "RBACData::ExpandPermissions: Expanded: %s", GetDebugPermissionString(permissions).c_str());
-}
-
-void RBACData::ClearData()
-{
-    _grantedPerms.clear();
-    _deniedPerms.clear();
-    _globalPerms.clear();
-}
-
-}
+/*
+ * Copyright (C) 2008-2015 TrinityCore <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "RBAC.h"
+#include "AccountMgr.h"
+#include "DatabaseEnv.h"
+#include "Log.h"
+
+namespace rbac
+{
+
+std::string GetDebugPermissionString(RBACPermissionContainer const& perms)
+{
+    std::string str = "";
+    if (!perms.empty())
+    {
+        std::ostringstream o;
+        RBACPermissionContainer::const_iterator itr = perms.begin();
+        o << (*itr);
+        for (++itr; itr != perms.end(); ++itr)
+            o << ", " << uint32(*itr);
+        str = o.str();
+    }
+
+    return str;
+}
+
+RBACCommandResult RBACData::GrantPermission(uint32 permissionId, int32 realmId /* = 0*/)
+{
+    // Check if permission Id exists
+    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);
+    if (!perm)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_ID_DOES_NOT_EXISTS;
+    }
+
+    // Check if already added in denied list
+    if (HasDeniedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in deny list",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_IN_DENIED_LIST;
+    }
+
+    // Already added?
+    if (HasGrantedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already granted",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_CANT_ADD_ALREADY_ADDED;
+    }
+
+    AddGrantedPermission(permissionId);
+
+    // Do not save to db when loading data from DB (realmId = 0)
+    if (realmId)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        SavePermission(permissionId, true, realmId);
+        CalculateNewPermissions();
+    }
+    else
+        TC_LOG_TRACE("rbac", "RBACData::GrantPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+
+    return RBAC_OK;
+}
+
+RBACCommandResult RBACData::DenyPermission(uint32 permissionId, int32 realmId /* = 0*/)
+{
+    // Check if permission Id exists
+    RBACPermission const* perm = sAccountMgr->GetRBACPermission(permissionId);
+    if (!perm)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission does not exists",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_ID_DOES_NOT_EXISTS;
+    }
+
+    // Check if already added in granted list
+    if (HasGrantedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission in grant list",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_IN_GRANTED_LIST;
+    }
+
+    // Already added?
+    if (HasDeniedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Permission already denied",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_CANT_ADD_ALREADY_ADDED;
+    }
+
+    AddDeniedPermission(permissionId);
+
+    // Do not save to db when loading data from DB (realmId = 0)
+    if (realmId)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        SavePermission(permissionId, false, realmId);
+        CalculateNewPermissions();
+    }
+    else
+        TC_LOG_TRACE("rbac", "RBACData::DenyPermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+
+    return RBAC_OK;
+}
+
+void RBACData::SavePermission(uint32 permission, bool granted, int32 realmId)
+{
+    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_INS_RBAC_ACCOUNT_PERMISSION);
+    stmt->setUInt32(0, GetId());
+    stmt->setUInt32(1, permission);
+    stmt->setBool(2, granted);
+    stmt->setInt32(3, realmId);
+    LoginDatabase.Execute(stmt);
+}
+
+RBACCommandResult RBACData::RevokePermission(uint32 permissionId, int32 realmId /* = 0*/)
+{
+    // Check if it's present in any list
+    if (!HasGrantedPermission(permissionId) && !HasDeniedPermission(permissionId))
+    {
+        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Not granted or revoked",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        return RBAC_CANT_REVOKE_NOT_IN_LIST;
+    }
+
+    RemoveGrantedPermission(permissionId);
+    RemoveDeniedPermission(permissionId);
+
+    // Do not save to db when loading data from DB (realmId = 0)
+    if (realmId)
+    {
+        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok and DB updated",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+        PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_DEL_RBAC_ACCOUNT_PERMISSION);
+        stmt->setUInt32(0, GetId());
+        stmt->setUInt32(1, permissionId);
+        stmt->setInt32(2, realmId);
+        LoginDatabase.Execute(stmt);
+
+        CalculateNewPermissions();
+    }
+    else
+        TC_LOG_TRACE("rbac", "RBACData::RevokePermission [Id: %u Name: %s] (Permission %u, RealmId %d). Ok",
+                       GetId(), GetName().c_str(), permissionId, realmId);
+
+    return RBAC_OK;
+}
+
+void RBACData::LoadFromDB()
+{
+    ClearData();
+
+    TC_LOG_DEBUG("rbac", "RBACData::LoadFromDB [Id: %u Name: %s]: Loading permissions", GetId(), GetName().c_str());
+    // Load account permissions (granted and denied) that affect current realm
+    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_RBAC_ACCOUNT_PERMISSIONS);
+    stmt->setUInt32(0, GetId());
+    stmt->setInt32(1, GetRealmId());
+
+    PreparedQueryResult result = LoginDatabase.Query(stmt);
+    if (result)
+    {
+        do
+        {
+            Field* fields = result->Fetch();
+            if (fields[1].GetBool())
+                GrantPermission(fields[0].GetUInt32());
+            else
+                DenyPermission(fields[0].GetUInt32());
+        }
+        while (result->NextRow());
+    }
+
+    // Add default permissions
+    RBACPermissionContainer const& permissions = sAccountMgr->GetRBACDefaultPermissions(_secLevel);
+    for (RBACPermissionContainer::const_iterator itr = permissions.begin(); itr != permissions.end(); ++itr)
+        GrantPermission(*itr);
+
+    // Force calculation of permissions
+    CalculateNewPermissions();
+}
+
+void RBACData::CalculateNewPermissions()
+{
+    TC_LOG_TRACE("rbac", "RBACData::CalculateNewPermissions [Id: %u Name: %s]", GetId(), GetName().c_str());
+
+    // Get the list of granted permissions
+    _globalPerms = GetGrantedPermissions();
+    ExpandPermissions(_globalPerms);
+    RBACPermissionContainer revoked = GetDeniedPermissions();
+    ExpandPermissions(revoked);
+    RemovePermissions(_globalPerms, revoked);
+}
+
+void RBACData::AddPermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
+{
+    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
+        permsTo.insert(*itr);
+}
+
+void RBACData::RemovePermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
+{
+    for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
+        permsTo.erase(*itr);
+}
+
+void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)
+{
+    RBACPermissionContainer toCheck = permissions;
+    permissions.clear();
+
+    while (!toCheck.empty())
+    {
+        // remove the permission from original list
+        uint32 permissionId = *toCheck.begin();
+        toCheck.erase(toCheck.begin());
+
+        RBACPermission const* permission = sAccountMgr->GetRBACPermission(permissionId);
+        if (!permission)
+            continue;
+
+        // insert into the final list (expanded list)
+        permissions.insert(permissionId);
+
+        // add all linked permissions (that are not already expanded) to the list of permissions to be checked
+        RBACPermissionContainer const& linkedPerms = permission->GetLinkedPermissions();
+        for (RBACPermissionContainer::const_iterator itr = linkedPerms.begin(); itr != linkedPerms.end(); ++itr)
+            if (permissions.find(*itr) == permissions.end())
+                toCheck.insert(*itr);
+    }
+
+    TC_LOG_DEBUG("rbac", "RBACData::ExpandPermissions: Expanded: %s", GetDebugPermissionString(permissions).c_str());
+}
+
+void RBACData::ClearData()
+{
+    _grantedPerms.clear();
+    _deniedPerms.clear();
+    _globalPerms.clear();
+}
+
+}
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 50981a163be..03566390a6c 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1757,9 +1757,9 @@ void GameObject::Use(Unit* user)
         return;
     }
 
-    if (Player* player = user->ToPlayer())
-        sOutdoorPvPMgr->HandleCustomSpell(player, spellId, this);
-
+    if (Player* player = user->ToPlayer())
+        sOutdoorPvPMgr->HandleCustomSpell(player, spellId, this);
+
     if (spellCaster)
         spellCaster->CastSpell(user, spellInfo, triggered);
     else
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 55d882c65d3..31a3b5becf5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -22621,15 +22621,17 @@ void Player::SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8
     GetSession()->SendPacket(&data);
 }
 
-void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time)
+void Player::SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time, bool welcome)
 {
     // type of warning, based on the time remaining until reset
     uint32 type;
-    if (time > 3600)
+    if (welcome)
         type = RAID_INSTANCE_WELCOME;
-    else if (time > 900 && time <= 3600)
+    else if (time > 21600)
+        type = RAID_INSTANCE_WELCOME;
+    else if (time > 3600)
         type = RAID_INSTANCE_WARNING_HOURS;
-    else if (time > 300 && time <= 900)
+    else if (time > 300)
         type = RAID_INSTANCE_WARNING_MIN;
     else
         type = RAID_INSTANCE_WARNING_MIN_SOON;
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 98b9d8a3d07..ee19eaf21ba 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1129,7 +1129,7 @@ class Player : public Unit, public GridObject<Player>
         void SendInitialPacketsAfterAddToMap();
         void SendSupercededSpell(uint32 oldSpell, uint32 newSpell);
         void SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8 arg = 0);
-        void SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time);
+        void SendInstanceResetWarning(uint32 mapid, Difficulty difficulty, uint32 time, bool welcome);
 
         bool CanInteractWithQuestGiver(Object* questGiver);
         Creature* GetNPCIfCanInteractWith(ObjectGuid guid, uint32 npcflagmask);
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4bc1e6d4193..c9c70e97513 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9964,15 +9964,11 @@ uint32 Unit::SpellDamageBonusDone(Unit* victim, SpellInfo const* spellProto, uin
         DoneTotal += int32(DoneAdvertisedBenefit * coeff * factorMod);
     }
 
-    float tmpDamage = float(int32(pdamage) + DoneTotal);
-    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicDamageAurasTick.
-    if (damagetype != DOT)
-    {
-        tmpDamage *= SpellDamagePctDone(victim, spellProto, damagetype);
-        // apply spellmod to Done damage (flat and pct)
-        if (Player* modOwner = GetSpellModOwner())
-            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
-    }
+    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
+    float tmpDamage = (int32(pdamage) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellDamagePctDone(victim, spellProto, damagetype));
+    // apply spellmod to Done damage (flat and pct)
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
 
     return uint32(std::max(tmpDamage, 0.0f));
 }
@@ -10812,15 +10808,11 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui
             DoneTotal = 0;
     }
 
-    float heal = float(int32(healamount) + DoneTotal);
-    // SPELLMOD_DOT will be applied in AuraEffect::HandlePeriodicHealAurasTick.
-    if (damagetype != DOT)
-    {
-        heal *= SpellHealingPctDone(victim, spellProto);
-        // apply spellmod to Done amount
-        if (Player* modOwner = GetSpellModOwner())
-            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, heal);
-    }
+    // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura::HandleAuraSpecificMods.
+    float heal = float(int32(healamount) + DoneTotal) * (damagetype == DOT ? 1.0f : SpellHealingPctDone(victim, spellProto));
+    // apply spellmod to Done amount
+    if (Player* modOwner = GetSpellModOwner())
+        modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
 
     return uint32(std::max(heal, 0.0f));
 }
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index e86fa523f68..cedfed2e7c5 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -163,7 +163,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
                 if (time_t timeReset = sInstanceSaveMgr->GetResetTimeFor(mEntry->MapID, diff))
                 {
                     uint32 timeleft = uint32(timeReset - time(NULL));
-                    GetPlayer()->SendInstanceResetWarning(mEntry->MapID, diff, timeleft);
+                    GetPlayer()->SendInstanceResetWarning(mEntry->MapID, diff, timeleft, true);
                 }
             }
         }
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp
index 260c2966a52..f26912a24dd 100644
--- a/src/server/game/Instances/InstanceSaveMgr.cpp
+++ b/src/server/game/Instances/InstanceSaveMgr.cpp
@@ -646,10 +646,10 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, Difficulty difficulty, b
 
         if (warn)
         {
-            if (now <= resetTime)
+            if (now >= resetTime)
                 timeLeft = 0;
             else
-                timeLeft = uint32(now - resetTime);
+                timeLeft = uint32(resetTime - now);
 
             ((InstanceMap*)map2)->SendResetWarnings(timeLeft);
         }
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index c1a462497cd..585533fa21b 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -3171,7 +3171,7 @@ void InstanceMap::UnloadAll()
 void InstanceMap::SendResetWarnings(uint32 timeLeft) const
 {
     for (MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
-        itr->GetSource()->SendInstanceResetWarning(GetId(), itr->GetSource()->GetDifficulty(IsRaid()), timeLeft);
+        itr->GetSource()->SendInstanceResetWarning(GetId(), itr->GetSource()->GetDifficulty(IsRaid()), timeLeft, false);
 }
 
 void InstanceMap::SetResetSchedule(bool on)