Skip to content
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

Properly handle null entities in events #355

Closed
wants to merge 1 commit into from
Closed

Properly handle null entities in events #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/SampSharp.Entities/Entities/EntityId.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public struct EntityId
/// <summary>
/// An empty entity identifier.
/// </summary>
public static readonly EntityId Empty = new EntityId();
public static readonly EntityId Empty = new EntityId(Guid.Empty, 65535);

/// <summary>
/// Initializes a new instance of the <see cref="EntityId" /> struct.
Expand Down Expand Up @@ -55,6 +55,9 @@ public EntityId(Guid type, int handle)
/// <returns></returns>
public bool Equals(EntityId other)
{
if(Handle == 65535 && other.Handle == Handle)
return true;

return Type.Equals(other.Type) && (Handle == other.Handle || Type == Guid.Empty);
}

Expand Down