Fix build missed a file
This commit is contained in:
@@ -116,7 +116,7 @@ namespace Game.BattlePets
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.WellKnown) && quality > BattlePetBreedQuality.Rare)
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.WellKnown) && quality > BattlePetBreedQuality.Rare)
|
||||||
{
|
{
|
||||||
Log.outError(LogFilter.Sql, $"Learnable BattlePetSpecies.db2 entry {speciesId} was referenced in `battle_pet_quality` with invalid quality {quality}. Maximum allowed quality is BattlePetBreedQuality::Rare.");
|
Log.outError(LogFilter.Sql, $"Learnable BattlePetSpecies.db2 entry {speciesId} was referenced in `battle_pet_quality` with invalid quality {quality}. Maximum allowed quality is BattlePetBreedQuality::Rare.");
|
||||||
continue;
|
continue;
|
||||||
@@ -165,7 +165,7 @@ namespace Game.BattlePets
|
|||||||
CreatureTemplate creatureTemplate = Global.ObjectMgr.GetCreatureTemplate(speciesEntry.CreatureID);
|
CreatureTemplate creatureTemplate = Global.ObjectMgr.GetCreatureTemplate(speciesEntry.CreatureID);
|
||||||
if (creatureTemplate != null)
|
if (creatureTemplate != null)
|
||||||
{
|
{
|
||||||
if (!speciesEntry.GetFlags().HasFlag(BattlePetSpeciesFlags.RandomDisplay))
|
if (!speciesEntry.HasFlag(BattlePetSpeciesFlags.RandomDisplay))
|
||||||
{
|
{
|
||||||
CreatureModel creatureModel = creatureTemplate.GetRandomValidModel();
|
CreatureModel creatureModel = creatureTemplate.GetRandomValidModel();
|
||||||
if (creatureModel != null)
|
if (creatureModel != null)
|
||||||
@@ -188,7 +188,7 @@ namespace Game.BattlePets
|
|||||||
BattlePetSpeciesRecord speciesEntry = CliDB.BattlePetSpeciesStorage.LookupByKey(species);
|
BattlePetSpeciesRecord speciesEntry = CliDB.BattlePetSpeciesStorage.LookupByKey(species);
|
||||||
if (speciesEntry != null)
|
if (speciesEntry != null)
|
||||||
{
|
{
|
||||||
if (speciesEntry.GetFlags().HasFlag(BattlePetSpeciesFlags.NotAccountWide))
|
if (speciesEntry.HasFlag(BattlePetSpeciesFlags.NotAccountWide))
|
||||||
{
|
{
|
||||||
if (ownerGuid.IsEmpty())
|
if (ownerGuid.IsEmpty())
|
||||||
{
|
{
|
||||||
@@ -387,7 +387,7 @@ namespace Game.BattlePets
|
|||||||
if (battlePetSpecies == null) // should never happen
|
if (battlePetSpecies == null) // should never happen
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.WellKnown)) // Not learnable
|
if (!battlePetSpecies.HasFlag(BattlePetSpeciesFlags.WellKnown)) // Not learnable
|
||||||
return;
|
return;
|
||||||
|
|
||||||
BattlePet pet = new();
|
BattlePet pet = new();
|
||||||
@@ -405,7 +405,7 @@ namespace Game.BattlePets
|
|||||||
pet.PacketInfo.Health = pet.PacketInfo.MaxHealth;
|
pet.PacketInfo.Health = pet.PacketInfo.MaxHealth;
|
||||||
|
|
||||||
Player player = _owner.GetPlayer();
|
Player player = _owner.GetPlayer();
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.NotAccountWide))
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.NotAccountWide))
|
||||||
{
|
{
|
||||||
BattlePetStruct.BattlePetOwnerInfo battlePetOwnerInfo = new();
|
BattlePetStruct.BattlePetOwnerInfo battlePetOwnerInfo = new();
|
||||||
battlePetOwnerInfo.Guid = player.GetGUID();
|
battlePetOwnerInfo.Guid = player.GetGUID();
|
||||||
@@ -495,7 +495,7 @@ namespace Game.BattlePets
|
|||||||
if (battlePet.SaveInfo == BattlePetSaveInfo.Removed)
|
if (battlePet.SaveInfo == BattlePetSaveInfo.Removed)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.NotAccountWide))
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.NotAccountWide))
|
||||||
if (!ownerGuid.IsEmpty() && battlePet.PacketInfo.OwnerInfo.HasValue)
|
if (!ownerGuid.IsEmpty() && battlePet.PacketInfo.OwnerInfo.HasValue)
|
||||||
if (battlePet.PacketInfo.OwnerInfo.Value.Guid != ownerGuid)
|
if (battlePet.PacketInfo.OwnerInfo.Value.Guid != ownerGuid)
|
||||||
return false;
|
return false;
|
||||||
@@ -506,7 +506,7 @@ namespace Game.BattlePets
|
|||||||
|
|
||||||
public bool HasMaxPetCount(BattlePetSpeciesRecord battlePetSpecies, ObjectGuid ownerGuid)
|
public bool HasMaxPetCount(BattlePetSpeciesRecord battlePetSpecies, ObjectGuid ownerGuid)
|
||||||
{
|
{
|
||||||
int maxPetsPerSpecies = battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.LegacyAccountUnique) ? 1 : SharedConst.DefaultMaxBattlePetsPerSpecies;
|
int maxPetsPerSpecies = battlePetSpecies.HasFlag(BattlePetSpeciesFlags.LegacyAccountUnique) ? 1 : SharedConst.DefaultMaxBattlePetsPerSpecies;
|
||||||
return GetPetCount(battlePetSpecies, ownerGuid) >= maxPetsPerSpecies;
|
return GetPetCount(battlePetSpecies, ownerGuid) >= maxPetsPerSpecies;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -558,7 +558,7 @@ namespace Game.BattlePets
|
|||||||
|
|
||||||
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
||||||
if (battlePetSpecies != null)
|
if (battlePetSpecies != null)
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.NotTradable))
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.NotTradable))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (IsPetInSlot(guid))
|
if (IsPetInSlot(guid))
|
||||||
@@ -616,7 +616,7 @@ namespace Game.BattlePets
|
|||||||
|
|
||||||
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
||||||
if (battlePetSpecies != null)
|
if (battlePetSpecies != null)
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.CantBattle))
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.CantBattle))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
byte qualityValue = (byte)quality;
|
byte qualityValue = (byte)quality;
|
||||||
@@ -652,7 +652,7 @@ namespace Game.BattlePets
|
|||||||
|
|
||||||
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
||||||
if (battlePetSpecies != null)
|
if (battlePetSpecies != null)
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.CantBattle))
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.CantBattle))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ushort level = pet.PacketInfo.Level;
|
ushort level = pet.PacketInfo.Level;
|
||||||
@@ -710,7 +710,7 @@ namespace Game.BattlePets
|
|||||||
|
|
||||||
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
var battlePetSpecies = CliDB.BattlePetSpeciesStorage.LookupByKey(pet.PacketInfo.Species);
|
||||||
if (battlePetSpecies != null)
|
if (battlePetSpecies != null)
|
||||||
if (battlePetSpecies.GetFlags().HasFlag(BattlePetSpeciesFlags.CantBattle))
|
if (battlePetSpecies.HasFlag(BattlePetSpeciesFlags.CantBattle))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ushort level = pet.PacketInfo.Level;
|
ushort level = pet.PacketInfo.Level;
|
||||||
|
|||||||
Reference in New Issue
Block a user