diff --git a/Source/Game/Calendar/CalendarManager.cs b/Source/Game/Calendar/CalendarManager.cs index be7b633e4..8ff78af12 100644 --- a/Source/Game/Calendar/CalendarManager.cs +++ b/Source/Game/Calendar/CalendarManager.cs @@ -627,7 +627,7 @@ namespace Game { Player player = Global.ObjAccessor.FindPlayer(playerCalendarEvent.InviteeGuid); if (player) - if (!calendarEvent.IsGuildEvent() || (calendarEvent.IsGuildEvent() && player.GetGuildId() != calendarEvent.GuildId)) + if (!calendarEvent.IsGuildEvent() || player.GetGuildId() != calendarEvent.GuildId) player.SendPacket(packet); } } diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs index de25e6780..bc7c6e50e 100644 --- a/Source/Game/Entities/Player/Player.DB.cs +++ b/Source/Game/Entities/Player/Player.DB.cs @@ -2687,7 +2687,7 @@ namespace Game.Entities Log.outError(LogFilter.Player, "Player (guidlow {0}) have invalid coordinates (MapId: {1} {2}). Teleport to default race/class locations.", guid.ToString(), mapId, GetPosition()); RelocateToHomebind(); } - else if (mapEntry != null && mapEntry.IsBattlegroundOrArena()) + else if (mapEntry.IsBattlegroundOrArena()) { Battleground currentBg = null; if (m_bgData.bgInstanceID != 0) //saved in Battleground diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs index ff3aba8c5..068b0fd2d 100644 --- a/Source/Game/Entities/Player/Player.Items.cs +++ b/Source/Game/Entities/Player/Player.Items.cs @@ -2460,7 +2460,7 @@ namespace Game.Entities } } - if (!released && IsBagPos(dst) && pDstItem != null) + if (!released && IsBagPos(dst)) { Bag bag = pDstItem.ToBag(); for (byte i = 0; i < bag.GetBagSize(); ++i) diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs index ca2f4d180..3c7777ce6 100644 --- a/Source/Game/Entities/Player/Player.Spells.cs +++ b/Source/Game/Entities/Player/Player.Spells.cs @@ -898,7 +898,7 @@ namespace Game.Entities break; } } - if (item != null && duration > 0) + if (duration > 0) { GetSession().SendItemEnchantTimeUpdate(GetGUID(), item.GetGUID(), (uint)slot, duration / 1000); m_enchantDuration.Add(new EnchantDuration(item, slot, duration)); @@ -2202,7 +2202,7 @@ namespace Game.Entities } // now re-learn if need re-activate - if (cur_active && !prevSpell.Active && learnLowRank) + if (!prevSpell.Active && learnLowRank) { if (AddSpell(prev_id, true, false, prevSpell.Dependent, prevSpell.Disabled)) { diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 13c5999bd..de7854c4a 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -4626,7 +4626,7 @@ namespace Game.Entities if (pet == null) return null; - if (IsInWorld && pet != null) + if (IsInWorld) return pet; } diff --git a/Source/Game/Events/GameEventManager.cs b/Source/Game/Events/GameEventManager.cs index b244b1c9d..0797f7c3e 100644 --- a/Source/Game/Events/GameEventManager.cs +++ b/Source/Game/Events/GameEventManager.cs @@ -420,7 +420,6 @@ namespace Game short event_id = result.Read(1); int internal_event_id = mGameEvent.Length + event_id - 1; - GameObjectData data = Global.ObjectMgr.GetGameObjectData(guid); if (data == null) { diff --git a/Source/Game/Handlers/PetHandler.cs b/Source/Game/Handlers/PetHandler.cs index 64f7faba1..69491317f 100644 --- a/Source/Game/Handlers/PetHandler.cs +++ b/Source/Game/Handlers/PetHandler.cs @@ -187,7 +187,7 @@ namespace Game pet.ClearUnitState(UnitState.Follow); // This is true if pet has no target or has target but targets differs. - if (pet.GetVictim() != TargetUnit || (pet.GetVictim() == TargetUnit && !pet.GetCharmInfo().IsCommandAttack())) + if (pet.GetVictim() != TargetUnit || !pet.GetCharmInfo().IsCommandAttack()) { if (pet.GetVictim()) pet.AttackStop(); diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs index 90f23576c..c4885332b 100644 --- a/Source/Game/Spells/SpellEffects.cs +++ b/Source/Game/Spells/SpellEffects.cs @@ -4881,7 +4881,7 @@ namespace Game.Spells FactionTemplateRecord casterFaction = caster.GetFactionTemplateEntry(); FactionTemplateRecord targetFaction = CliDB.FactionTemplateStorage.LookupByKey(gameObjTarget.GetFaction()); // Do not allow to damage GO's of friendly factions (ie: Wintergrasp Walls/Ulduar Storm Beacons) - if (targetFaction == null || (casterFaction != null && targetFaction != null && !casterFaction.IsFriendlyTo(targetFaction))) + if (targetFaction == null || (casterFaction != null && !casterFaction.IsFriendlyTo(targetFaction))) gameObjTarget.ModifyHealth(-damage, caster, GetSpellInfo().Id); }