Skip to content

Check for NPC on ownedby condition #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rexxar-tc merged 5 commits into from
Aug 24, 2018
Merged

Check for NPC on ownedby condition #55

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdb0c66
Check for NPC on ownedby condition
SplenectomY Aug 23, 2018
4c924ba
Update CleanupModule.cs
SplenectomY Aug 23, 2018
cd9b4a0
Update CleanupModule.cs
SplenectomY Aug 23, 2018
970ab4e
Update CleanupModule.cs
SplenectomY Aug 23, 2018
33fb4ae
Complying to change req.
SplenectomY Aug 23, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update CleanupModule.cs
  • Loading branch information
@SplenectomY
SplenectomY authored Aug 23, 2018
commit 970ab4ee61c9cc6eb2f4b082ff7ff00a5d71fda8
7 changes: 4 additions & 3 deletions Essentials/Commands/CleanupModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public bool PlayerDistanceLessThan(MyCubeGrid grid, double dist)
[Condition("ownedby", helpText: "Finds grids owned by the given player. Can specify player name, IdentityId, 'nobody', or 'pirates'.")]
public bool OwnedBy(MyCubeGrid grid, string str)
{
long identityId = null;
long identityId;

if (string.Compare(str, "nobody", StringComparison.InvariantCultureIgnoreCase) == 0)
{
Expand All @@ -284,15 +284,16 @@ public bool OwnedBy(MyCubeGrid grid, string str)
if(long.TryParse(str, out long NPCId))
{
if(MySession.Static.Players.IdentityIsNpc(NPCId))
{
Copy link
Copy Markdown
Contributor

@rexxar-tc rexxar-tc Aug 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get a null reference exception if this statement is false. Remove the else on L291
return grid.BigOwners.Contains(NPCId);
}
}
else
{
return false;
}

identityId = player.IdentityId;
}
identityId = player.IdentityId;
}

return grid.BigOwners.Contains(identityId);
Expand Down