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/WPCommands.cs
+21 -21
View File
@@ -25,7 +25,7 @@ namespace Game.Chat.Commands
if (!optionalPathId.HasValue)
{
if (target)
if (target != null)
pathId = target.GetWaypointPath();
else
{
@@ -321,7 +321,7 @@ namespace Game.Chat.Commands
uint pathId = optionalPathId.Value;
if (!target)
if (target == null)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
return false;
@@ -397,7 +397,7 @@ namespace Game.Chat.Commands
Creature target = handler.GetSelectedCreature();
// User did select a visual waypoint?
if (!target || target.GetEntry() != 1)
if (target == null || target.GetEntry() != 1)
{
handler.SendSysMessage("|cffff33ffERROR: You must select a waypoint.|r");
return false;
@@ -487,7 +487,7 @@ namespace Game.Chat.Commands
// What to do:
// Move the visual spawnpoint
// Respawn the owner of the waypoints
if (!Creature.DeleteFromDB(target.GetSpawnId()))
if (Creature.DeleteFromDB(target.GetSpawnId()))
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1);
return false;
@@ -495,7 +495,7 @@ namespace Game.Chat.Commands
// re-create
Creature creature = Creature.CreateCreature(1, map, chr.GetPosition());
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1);
return false;
@@ -512,7 +512,7 @@ namespace Game.Chat.Commands
// To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true);
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1);
return false;
@@ -575,7 +575,7 @@ namespace Game.Chat.Commands
// No PathID provided
// . Player must have selected a creature
if (!target)
if (target == null)
{
handler.SendSysMessage(CypherStrings.SelectCreature);
return false;
@@ -588,7 +588,7 @@ namespace Game.Chat.Commands
// PathID provided
// Warn if player also selected a creature
// . Creature selection is ignored <-
if (target)
if (target != null)
handler.SendSysMessage(CypherStrings.WaypointCreatselected);
pathId = optionalPathId.Value;
@@ -598,7 +598,7 @@ namespace Game.Chat.Commands
if (subCommand == "info")
{
// Check if the user did specify a visual waypoint
if (!target || target.GetEntry() != 1)
if (target == null || target.GetEntry() != 1)
{
handler.SendSysMessage(CypherStrings.WaypointVpSelect);
return false;
@@ -661,7 +661,7 @@ namespace Game.Chat.Commands
{
ulong wpguid = result2.Read<ulong>(0);
if (!Creature.DeleteFromDB(wpguid))
if (Creature.DeleteFromDB(wpguid))
{
handler.SendSysMessage(CypherStrings.WaypointNotremoved, wpguid);
hasError = true;
@@ -692,7 +692,7 @@ namespace Game.Chat.Commands
Map map = chr.GetMap();
Creature creature = Creature.CreateCreature(id, map, new Position(x, y, z, o));
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, id);
return false;
@@ -709,13 +709,13 @@ namespace Game.Chat.Commands
// To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true);
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, id);
return false;
}
if (target)
if (target != null)
{
creature.SetDisplayId(target.GetDisplayId());
creature.SetObjectScale(0.5f);
@@ -758,7 +758,7 @@ namespace Game.Chat.Commands
Map map = chr.GetMap();
Creature creature = Creature.CreateCreature(1, map, new Position(x, y, z, 0));
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1);
return false;
@@ -774,13 +774,13 @@ namespace Game.Chat.Commands
creature.Dispose();
creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true);
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1);
return false;
}
if (target)
if (target != null)
{
creature.SetDisplayId(target.GetDisplayId());
creature.SetObjectScale(0.5f);
@@ -813,7 +813,7 @@ namespace Game.Chat.Commands
Position pos = new(x, y, z, o);
Creature creature = Creature.CreateCreature(1, map, pos);
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointNotcreated, 1);
return false;
@@ -829,13 +829,13 @@ namespace Game.Chat.Commands
creature.Dispose();
creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true);
if (!creature)
if (creature == null)
{
handler.SendSysMessage(CypherStrings.WaypointNotcreated, 1);
return false;
}
if (target)
if (target != null)
{
creature.SetDisplayId(target.GetDisplayId());
creature.SetObjectScale(0.5f);
@@ -860,7 +860,7 @@ namespace Game.Chat.Commands
{
ulong lowguid = result.Read<ulong>(0);
if (!Creature.DeleteFromDB(lowguid))
if (Creature.DeleteFromDB(lowguid))
{
handler.SendSysMessage(CypherStrings.WaypointNotremoved, lowguid);
hasError = true;
@@ -892,7 +892,7 @@ namespace Game.Chat.Commands
static bool HandleWpUnLoadCommand(CommandHandler handler)
{
Creature target = handler.GetSelectedCreature();
if (!target)
if (target == null)
{
handler.SendSysMessage("|cff33ffffYou must select a target.|r");
return true;