Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into Spells

2 files changed, 4 insertions, 0 deletions

diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index d2ac852bbfe..c2a8dcd3538 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -945,6 +945,8 @@ uint32 Object::GetUpdateFieldData(Player const* target, uint32*& flags) const
             break;
         case TYPEID_OBJECT:
             break;
+        default:
+            break;
     }
 
     return visibleFlag;
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index 2c0fe333b00..81248519994 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -155,6 +155,8 @@ void WorldSession::HandleChatMessage(ChatMsg type, uint32 lang, std::string msg,
                     if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD))
                         lang = LANG_UNIVERSAL;
                     break;
+                default:
+                    break;
             }
         }