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/Handlers/PetitionsHandler.cs
+10 -10
View File
@@ -18,7 +18,7 @@ namespace Game
{
// prevent cheating
Creature creature = GetPlayer().GetNPCIfCanInteractWith(packet.Unit, NPCFlags.Petitioner, NPCFlags2.None);
if (!creature)
if (creature == null)
{
Log.outDebug(LogFilter.Network, "WORLD: HandlePetitionBuyOpcode - {0} not found or you can't interact with him.", packet.Unit.ToString());
return;
@@ -35,7 +35,7 @@ namespace Game
if (GetPlayer().GetGuildId() != 0)
return;
if (Global.GuildMgr.GetGuildByName(packet.Title))
if (Global.GuildMgr.GetGuildByName(packet.Title) != null)
{
Guild.SendCommandResult(this, GuildCommandType.CreateGuild, GuildCommandError.NameExists_S, packet.Title);
return;
@@ -70,7 +70,7 @@ namespace Game
GetPlayer().ModifyMoney(-cost);
Item charter = GetPlayer().StoreNewItem(dest, charterItemID, true);
if (!charter)
if (charter == null)
return;
charter.SetPetitionId((uint)charter.GetGUID().GetCounter());
@@ -167,7 +167,7 @@ namespace Game
void HandlePetitionRenameGuild(PetitionRenameGuild packet)
{
Item item = GetPlayer().GetItemByGuid(packet.PetitionGuid);
if (!item)
if (item == null)
return;
Petition petition = Global.PetitionMgr.GetPetition(packet.PetitionGuid);
@@ -177,7 +177,7 @@ namespace Game
return;
}
if (Global.GuildMgr.GetGuildByName(packet.NewGuildName))
if (Global.GuildMgr.GetGuildByName(packet.NewGuildName) != null)
{
Guild.SendCommandResult(this, GuildCommandType.CreateGuild, GuildCommandError.NameExists_S, packet.NewGuildName);
return;
@@ -274,7 +274,7 @@ namespace Game
// update for owner if online
Player owner1 = Global.ObjAccessor.FindPlayer(ownerGuid);
if (owner1)
if (owner1 != null)
owner1.SendPacket(signResult);
}
@@ -302,7 +302,7 @@ namespace Game
void HandleOfferPetition(OfferPetition packet)
{
Player player = Global.ObjAccessor.FindConnectedPlayer(packet.TargetPlayer);
if (!player)
if (player == null)
return;
Petition petition = Global.PetitionMgr.GetPetition(packet.ItemGUID);
@@ -335,7 +335,7 @@ namespace Game
{
// Check if player really has the required petition charter
Item item = GetPlayer().GetItemByGuid(packet.Item);
if (!item)
if (item == null)
return;
Petition petition = Global.PetitionMgr.GetPetition(packet.Item);
@@ -362,7 +362,7 @@ namespace Game
}
// Check if guild name is already taken
if (Global.GuildMgr.GetGuildByName(name))
if (Global.GuildMgr.GetGuildByName(name) != null)
{
Guild.SendCommandResult(this, GuildCommandType.CreateGuild, GuildCommandError.NameExists_S, name);
return;
@@ -419,7 +419,7 @@ namespace Game
public void SendPetitionShowList(ObjectGuid guid)
{
Creature creature = GetPlayer().GetNPCIfCanInteractWith(guid, NPCFlags.Petitioner, NPCFlags2.None);
if (!creature)
if (creature == null)
{
Log.outDebug(LogFilter.Network, "WORLD: HandlePetitionShowListOpcode - {0} not found or you can't interact with him.", guid.ToString());
return;