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

Some cleanups. (might break build for scripts as they are a WIP)

Browse Source
This commit is contained in:
hondacrx
2023-10-08 10:35:31 -04:00
parent fa10b981bd
commit cda53c8e7f
208 changed files with 2266 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/PetCommands.cs
+7 -7
View File
@@ -17,7 +17,7 @@ namespace Game.Chat
Player player = handler.GetSession().GetPlayer();
Creature creatureTarget = handler.GetSelectedCreature();
if (!creatureTarget || creatureTarget.IsPet() || creatureTarget.IsTypeId(TypeId.Player))
if (creatureTarget == null || creatureTarget.IsPet() || creatureTarget.IsTypeId(TypeId.Player))
{
handler.SendSysMessage(CypherStrings.SelectCreature);
return false;
@@ -65,7 +65,7 @@ namespace Game.Chat
static bool HandlePetLearnCommand(CommandHandler handler, SpellInfo spellInfo)
{
Pet pet = GetSelectedPlayerPetOrOwn(handler);
if (!pet)
if (pet == null)
{
handler.SendSysMessage(CypherStrings.SelectPlayerOrPet);
return false;
@@ -97,7 +97,7 @@ namespace Game.Chat
static bool HandlePetUnlearnCommand(CommandHandler handler, SpellInfo spellInfo)
{
Pet pet = GetSelectedPlayerPetOrOwn(handler);
if (!pet)
if (pet == null)
{
handler.SendSysMessage(CypherStrings.SelectPlayerOrPet);
return false;
@@ -117,8 +117,8 @@ namespace Game.Chat
static bool HandlePetLevelCommand(CommandHandler handler, int? level)
{
Pet pet = GetSelectedPlayerPetOrOwn(handler);
Player owner = pet ? pet.GetOwner() : null;
if (!pet || !owner)
Player owner = pet != null ? pet.GetOwner() : null;
if (pet == null || owner == null)
{
handler.SendSysMessage(CypherStrings.SelectPlayerOrPet);
return false;
@@ -146,7 +146,7 @@ namespace Game.Chat
static Pet GetSelectedPlayerPetOrOwn(CommandHandler handler)
{
Unit target = handler.GetSelectedUnit();
if (target)
if (target != null)
{
if (target.IsTypeId(TypeId.Player))
return target.ToPlayer().GetPet();
@@ -156,7 +156,7 @@ namespace Game.Chat
}
Player player = handler.GetSession().GetPlayer();
return player ? player.GetPet() : null;
return player != null ? player.GetPet() : null;
}
}
}