Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes.

Browse Source
This commit is contained in:
hondacrx
2022-10-28 21:58:31 -04:00
parent 4c392ae3f7
commit 572cdc1483
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+7 -4
View File
@@ -959,7 +959,7 @@ namespace Game.Entities
void DespawnForPlayer(Player seer, TimeSpan respawnTime)
{
PerPlayerState perPlayerState = GetOrCreatePerPlayerStates()[seer.GetGUID()];
PerPlayerState perPlayerState = GetOrCreatePerPlayerStates(seer.GetGUID());
perPlayerState.ValidUntil = GameTime.GetSystemTime() + respawnTime;
perPlayerState.Despawned = true;
seer.UpdateVisibilityOf(this);
@@ -3002,7 +3002,7 @@ namespace Game.Entities
void SetGoStateFor(GameObjectState state, Player viewer)
{
PerPlayerState perPlayerState = GetOrCreatePerPlayerStates()[viewer.GetGUID()];
PerPlayerState perPlayerState = GetOrCreatePerPlayerStates(viewer.GetGUID());
perPlayerState.ValidUntil = GameTime.GetSystemTime() + TimeSpan.FromSeconds(m_respawnDelayTime);
perPlayerState.State = state;
@@ -3495,12 +3495,15 @@ namespace Game.Entities
return true;
}
Dictionary<ObjectGuid, PerPlayerState> GetOrCreatePerPlayerStates()
PerPlayerState GetOrCreatePerPlayerStates(ObjectGuid guid)
{
if (m_perPlayerState == null)
m_perPlayerState = new();
return m_perPlayerState;
if (!m_perPlayerState.ContainsKey(guid))
m_perPlayerState[guid] = new();
return m_perPlayerState[guid];
}
public override ushort GetAIAnimKitId() { return _animKitId; }
Source/Game/Entities/Pet.cs
+2 -2
View File
@@ -290,7 +290,7 @@ namespace Game.Entities
owner.RemovePet(null, PetSaveMode.NotInSlot);
var unslottedPetIndex = petStable.UnslottedPets.FindIndex(unslottedPet => unslottedPet.PetNumber == petInfoNumber);
Cypher.Assert(petStable.CurrentPetIndex == 0);
Cypher.Assert(!petStable.CurrentPetIndex.HasValue);
Cypher.Assert(unslottedPetIndex != -1);
petStable.SetCurrentUnslottedPetIndex((uint)unslottedPetIndex);
@@ -302,7 +302,7 @@ namespace Game.Entities
Cypher.Assert(activePetIndex != -1);
// Check that we either have no pet (unsummoned by player) or it matches temporarily unsummoned pet by server (for example on flying mount)
Cypher.Assert(petStable.CurrentPetIndex == 0 || petStable.CurrentPetIndex == activePetIndex);
Cypher.Assert(!petStable.CurrentPetIndex.HasValue || petStable.CurrentPetIndex == activePetIndex);
petStable.SetCurrentActivePetIndex((uint)activePetIndex);
}
Source/Game/Entities/Player/Player.cs
+1 -1
View File
@@ -4284,7 +4284,7 @@ namespace Game.Entities
map.AddToMap(pet.ToCreature());
Cypher.Assert(petStable.CurrentPetIndex == 0);
Cypher.Assert(!petStable.CurrentPetIndex.HasValue);
petStable.SetCurrentUnslottedPetIndex((uint)petStable.UnslottedPets.Count);
PetStable.PetInfo petInfo = new();
pet.FillPetInfo(petInfo);
Source/Game/Spells/SpellEffects.cs
+3 -3
View File
@@ -168,7 +168,7 @@ namespace Game.Spells
if (unitCaster != null && apply_direct_bonus)
{
uint bonus = unitCaster.SpellDamageBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (uint)(bonus * variance));
damage = (int)unitTarget.SpellDamageBonusTaken(unitCaster, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect);
}
@@ -697,7 +697,7 @@ namespace Game.Spells
if (unitCaster != null)
{
uint bonus = unitCaster.SpellDamageBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (uint)(bonus * variance));
damage = (int)unitTarget.SpellDamageBonusTaken(unitCaster, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect);
}
@@ -886,7 +886,7 @@ namespace Game.Spells
if (unitCaster != null)
unitCaster.SpellDamageBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (uint)(bonus * variance));
if (unitCaster != null)
damage = (int)unitTarget.SpellDamageBonusTaken(unitCaster, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect);