Core/Refactor: Part 1

Source/Game/Handlers/BattleFieldHandler.cs

@@ -90,7 +90,6 @@ namespace Game
         /// This is call when player leave battlefield zone.
         /// </summary>
         /// <param name="queueId">The queue id of Bf</param>
-        /// <param name="queueId">The queue id of Bf</param>
         /// <param name="battleState">Battlefield status</param>
         /// <param name="relocated">Whether player is added to Bf on the spot or teleported from queue</param>
         /// <param name="reason">Reason why player left battlefield</param>

Source/Game/Handlers/CalendarHandler.cs

@@ -509,7 +509,6 @@ namespace Game
             if (save == null)
                 return;
 
-            ObjectGuid guid = GetPlayer().GetGUID();
             long currTime = Time.UnixTime;
 
             CalendarRaidLockoutUpdated packet = new CalendarRaidLockoutUpdated();

Source/Game/Handlers/MiscHandler.cs

@@ -745,7 +745,7 @@ namespace Game
             if (_warden == null || packet.Data.GetSize() == 0)
                 return;
 
-            var unpacked = new ByteBuffer(_warden.DecryptData(packet.Data.GetData()));            
+            _warden.DecryptData(packet.Data.GetData());            
             WardenOpcodes opcode = (WardenOpcodes)packet.Data.ReadUInt8();
 
             switch (opcode)

Source/Game/Handlers/MovementHandler.cs

@@ -287,7 +287,6 @@ namespace Game
             // only add to bg group and object, if the player was invited (else he entered through command)
             if (GetPlayer().InBattleground())
             {
-                Battleground bg;
                 // cleanup setting if outdated
                 if (!mapEntry.IsBattlegroundOrArena())
                 {
@@ -297,10 +296,14 @@ namespace Game
                     GetPlayer().SetBGTeam(0);
                 }
                 // join to bg case
-                else if (bg = GetPlayer().GetBattleground())
+                else
                 {
-                    if (GetPlayer().IsInvitedForBattlegroundInstance(GetPlayer().GetBattlegroundId()))
-                        bg.AddPlayer(GetPlayer());
+                    Battleground bg = GetPlayer().GetBattleground();
+                    if (bg)
+                    {
+                        if (GetPlayer().IsInvitedForBattlegroundInstance(GetPlayer().GetBattlegroundId()))
+                            bg.AddPlayer(GetPlayer());
+                    }
                 }
             }
 

Source/Game/Handlers/PetitionsHandler.cs

@@ -255,7 +255,7 @@ namespace Game
             }
 
             ObjectGuid ownerGuid = ObjectGuid.Create(HighGuid.Player, result.Read<ulong>(0));
-            ulong signs = result.Read<ulong>(1);
+            //ulong signs = result.Read<ulong>(1);
 
             if (ownerGuid == GetPlayer().GetGUID())
                 return;
@@ -267,7 +267,6 @@ namespace Game
                 return;
             }
 
-
             if (GetPlayer().GetGuildId() != 0)
             {
                 Guild.SendCommandResult(this, GuildCommandType.InvitePlayer, GuildCommandError.AlreadyInGuild_S, GetPlayer().GetName());

Source/Game/Handlers/VehicleHandler.cs

@@ -97,15 +97,18 @@ namespace Game
 
             vehicle_base.m_movementInfo = packet.Status;
 
-            Unit vehUnit;
             if (packet.DstVehicle.IsEmpty())
                 GetPlayer().ChangeSeat(-1, packet.DstSeatIndex != 255);
-            else if (vehUnit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.DstVehicle))
+            else
             {
-                Vehicle vehicle = vehUnit.GetVehicleKit();
-                if (vehicle)
-                    if (vehicle.HasEmptySeat((sbyte)packet.DstSeatIndex))
-                    vehUnit.HandleSpellClick(GetPlayer(), (sbyte)packet.DstSeatIndex);
+                Unit vehUnit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.DstVehicle);
+                if (vehUnit)
+                {
+                    Vehicle vehicle = vehUnit.GetVehicleKit();
+                    if (vehicle)
+                        if (vehicle.HasEmptySeat((sbyte) packet.DstSeatIndex))
+                            vehUnit.HandleSpellClick(GetPlayer(), (sbyte) packet.DstSeatIndex);
+                }
             }
         }
 
@@ -123,15 +126,19 @@ namespace Game
                     GetPlayer().GetGUID().ToString(), seat.Flags);
                 return;
             }
-            Unit vehUnit;
+
             if (vehicle_base.GetGUID() == packet.Vehicle)
                 GetPlayer().ChangeSeat((sbyte)packet.SeatIndex);
-            else if (vehUnit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Vehicle))
+            else
             {
-                Vehicle vehicle = vehUnit.GetVehicleKit();
-                if (vehicle)                
-                    if (vehicle.HasEmptySeat((sbyte)packet.SeatIndex))
-                        vehUnit.HandleSpellClick(GetPlayer(), (sbyte)packet.SeatIndex);
+                Unit vehUnit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Vehicle);
+                if (vehUnit)
+                {
+                    Vehicle vehicle = vehUnit.GetVehicleKit();
+                    if (vehicle)
+                        if (vehicle.HasEmptySeat((sbyte) packet.SeatIndex))
+                            vehUnit.HandleSpellClick(GetPlayer(), (sbyte) packet.SeatIndex);
+                }
             }
         }