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

Core: Update to 10.2.7

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/468a06baf046b716305ee665e3cfd93c80e99457)
This commit is contained in:
Hondacrx
2024-08-24 00:13:35 -04:00
parent ce99a1f7f6
commit 1ca497b79f
27 changed files with 3020 additions and 2701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.cs
+74
View File
@@ -957,16 +957,46 @@ namespace Game.Entities
if (srcPetIndex >= 0)
{
PetStableFlags flagToAdd, flagToRemove;
if (SharedConst.IsActivePetSlot(dstPetSlot))
{
flagToAdd = PetStableFlags.Active;
flagToRemove = PetStableFlags.Inactive;
}
else
{
flagToAdd = PetStableFlags.Inactive;
flagToRemove = PetStableFlags.Active;
}
StableInfo stableInfo = m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.PetStable);
StablePetInfo stablePetInfo = stableInfo.ModifyValue(stableInfo.Pets, srcPetIndex);
SetUpdateFieldValue(stablePetInfo.ModifyValue(stablePetInfo.PetSlot), (uint)dstPetSlot);
SetUpdateFieldFlagValue(stablePetInfo.ModifyValue(stablePetInfo.PetFlags), (byte)flagToAdd);
RemoveUpdateFieldFlagValue(stablePetInfo.ModifyValue(stablePetInfo.PetFlags), (byte)flagToRemove);
}
if (dstPetIndex >= 0)
{
PetStableFlags flagToAdd, flagToRemove;
if (SharedConst.IsActivePetSlot(srcPetSlot))
{
flagToAdd = PetStableFlags.Active;
flagToRemove = PetStableFlags.Inactive;
}
else
{
flagToAdd = PetStableFlags.Inactive;
flagToRemove = PetStableFlags.Active;
}
StableInfo stableInfo = m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.PetStable);
StablePetInfo stablePetInfo = stableInfo.ModifyValue(stableInfo.Pets, dstPetIndex);
SetUpdateFieldValue(stablePetInfo.ModifyValue(stablePetInfo.PetSlot), (uint)srcPetSlot);
SetUpdateFieldFlagValue(stablePetInfo.ModifyValue(stablePetInfo.PetFlags), (byte)flagToAdd);
RemoveUpdateFieldFlagValue(stablePetInfo.ModifyValue(stablePetInfo.PetFlags), (byte)flagToRemove);
}
sess.SendPetStableResult(StableResult.StableSuccess);
@@ -4745,6 +4775,48 @@ namespace Game.Entities
}
}
public void DeletePetFromDB(uint petNumber)
{
if (m_activePlayerData.PetStable.HasValue())
{
int ufIndex = m_activePlayerData.PetStable.GetValue().Pets.FindIndexIf(p => p.PetNumber == petNumber);
if (ufIndex >= 0)
{
StableInfo stableInfo = m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.PetStable);
RemoveDynamicUpdateFieldValue(stableInfo.ModifyValue(stableInfo.Pets), ufIndex);
}
}
if (m_petStable == null)
return;
var petIndex = m_petStable.GetCurrentActivePetIndex();
if (petIndex.HasValue)
if (m_petStable.ActivePets[petIndex.Value] != null && m_petStable.ActivePets[petIndex.Value].PetNumber == petNumber)
m_petStable.CurrentPetIndex = null;
bool foundPet = false;
void FindAndRemovePet(PetStable.PetInfo[] pets)
{
for (var i = 0; i < pets.Length; ++i)
{
var pet = pets[i];
if (pet != null && pet.PetNumber == petNumber && pet.Type == PetType.Hunter)
{
pets[i] = null;
foundPet = true;
}
}
};
FindAndRemovePet(m_petStable.ActivePets);
FindAndRemovePet(m_petStable.StabledPets);
if (foundPet)
Pet.DeleteFromDB(petNumber);
}
public void SendTameFailure(PetTameResult result)
{
PetTameFailure petTameFailure = new();
@@ -5368,6 +5440,8 @@ namespace Game.Entities
tag |= ChatFlags.AFK;
if (IsDeveloper())
tag |= ChatFlags.Dev;
if (m_activePlayerData.TimerunningSeasonID != 0)
tag |= ChatFlags.Timerunning;
return tag;
}