From 8bef51cf6e5b7add0db3f70452efe420070a0de8 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 28 Aug 2023 11:19:01 -0400 Subject: [PATCH] Core/Players: Fixed base hit chance initialization for players Port From (https://github.com/TrinityCore/TrinityCore/commit/1f8eddc4f0cf443c45a930bc919007541210984a) --- Source/Game/Entities/Player/Player.Fields.cs | 4 ++-- Source/Game/Entities/Player/Player.Items.cs | 2 +- Source/Game/Entities/Player/Player.cs | 10 +++++++--- Source/Game/Entities/Unit/Unit.cs | 9 +++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Source/Game/Entities/Player/Player.Fields.cs b/Source/Game/Entities/Player/Player.Fields.cs index b591ec027..db6264194 100644 --- a/Source/Game/Entities/Player/Player.Fields.cs +++ b/Source/Game/Entities/Player/Player.Fields.cs @@ -22,7 +22,7 @@ namespace Game.Entities { public partial class Player { - public WorldSession GetSession() { return Session; } + public WorldSession GetSession() { return _session; } public PlayerSocial GetSocial() { return m_social; } //Gossip @@ -179,7 +179,7 @@ namespace Game.Entities WorldLocation _corpseLocation; //Core - WorldSession Session; + WorldSession _session; public PlayerData m_playerData; public ActivePlayerData m_activePlayerData; diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs index 24f1a15a9..5a770bfad 100644 --- a/Source/Game/Entities/Player/Player.Items.cs +++ b/Source/Game/Entities/Player/Player.Items.cs @@ -6204,7 +6204,7 @@ namespace Game.Entities public void SendLoot(Loot loot, bool aeLooting = false) { if (!GetLootGUID().IsEmpty() && !aeLooting) - Session.DoLootReleaseAll(); + _session.DoLootReleaseAll(); Log.outDebug(LogFilter.Loot, $"Player::SendLoot: Player: '{GetName()}' ({GetGUID()}), Loot: {loot.GetOwnerGUID()}"); diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 2286afa06..9e686bd8e 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -41,7 +41,11 @@ namespace Game.Entities m_playerData = new PlayerData(); m_activePlayerData = new ActivePlayerData(); - Session = session; + _session = session; + + ModMeleeHitChance = 7.5f; + ModRangedHitChance = 7.5f; + ModSpellHitChance = 15.0f; // players always accept if (!GetSession().HasPermission(RBACPermissions.CanFilterWhispers)) @@ -809,7 +813,7 @@ namespace Game.Entities //Network public void SendPacket(ServerPacket data) { - Session.SendPacket(data); + _session.SendPacket(data); } public DeclinedName GetDeclinedNames() { return _declinedname; } @@ -6383,7 +6387,7 @@ namespace Game.Entities } public void SendSysMessage(string str, params object[] args) { - new CommandHandler(Session).SendSysMessage(string.Format(str, args)); + new CommandHandler(_session).SendSysMessage(string.Format(str, args)); } public void SendBuyError(BuyResult msg, Creature creature, uint item) { diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index 138ca7551..94a05a034 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -60,12 +60,9 @@ namespace Game.Entities for (byte i = 0; i < (int)WeaponAttackType.Max; ++i) m_weaponDamage[i] = new float[] { 1.0f, 2.0f }; - if (IsTypeId(TypeId.Player)) - { - ModMeleeHitChance = 7.5f; - ModRangedHitChance = 7.5f; - ModSpellHitChance = 15.0f; - } + ModMeleeHitChance = 0.0f; + ModRangedHitChance = 0.0f; + ModSpellHitChance = 0.0f; BaseSpellCritChance = 5; for (byte i = 0; i < (int)UnitMoveType.Max; ++i)