Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2 files changed, 8 insertions, 14 deletions

diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 18dbeba8f89..989a9b540f5 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -1744,19 +1744,13 @@ public:
         result = CharacterDatabase.Query(stmt);
         if (result)
         {
-            uint32 guildId           = 0;
-            std::string guildName   = "";
-            std::string guildRank   = "";
-            std::string note        = "";
-            std::string officeNote  = "";
-
-            Field* fields      = result->Fetch();
-            guildId            = fields[0].GetUInt32();
-            guildName          = fields[1].GetString();
-            //rankId           = fields[2].GetUInt8();
-            guildRank          = fields[3].GetString();
-            note               = fields[4].GetString();
-            officeNote         = fields[5].GetString();
+            Field* fields = result->Fetch();
+
+            uint32 guildId = fields[0].GetUInt32();
+            std::string guildName = fields[1].GetString();
+            std::string guildRank = fields[2].GetString();
+            std::string note = fields[3].GetString();
+            std::string officeNote = fields[4].GetString();
 
             handler->PSendSysMessage(LANG_PINFO_GUILD_INFO, guildName.c_str(), guildId, guildRank.c_str(), note.c_str(), officeNote.c_str());
         }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index ccbecbe4290..c92f10e8b95 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -422,7 +422,7 @@ class boss_deathbringer_saurfang : public CreatureScript
 
             void UpdateAI(uint32 const diff)
             {
-                if (!UpdateVictim() && (!events.IsInPhase(PHASE_INTRO_A) || events.IsInPhase(PHASE_INTRO_H)))
+                if (!UpdateVictim() && !(events.IsInPhase(PHASE_INTRO_A) || events.IsInPhase(PHASE_INTRO_H)))
                     return;
 
                 events.Update(diff);