From 8bfc89d32e3689720c2f41e9ddd8509f4eff9cc2 Mon Sep 17 00:00:00 2001 From: Frank van der Heijden <22407829+FrankHeijden@users.noreply.github.com> Date: Sat, 8 Aug 2020 00:40:39 +0200 Subject: [PATCH] Instead of return a set containing null, return null (#948) --- .../events/ClaimInspectionEvent.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/events/ClaimInspectionEvent.java b/src/main/java/me/ryanhamshire/GriefPrevention/events/ClaimInspectionEvent.java index 194586b..944e99a 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/events/ClaimInspectionEvent.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/events/ClaimInspectionEvent.java @@ -34,8 +34,20 @@ public class ClaimInspectionEvent extends PlayerEvent implements Cancellable * @param inspectedBlock The inspected block * @param claim The claim involved */ - public ClaimInspectionEvent(Player player, Block inspectedBlock, Claim claim) { - this(player, inspectedBlock, Collections.singleton(claim), false); + public ClaimInspectionEvent(Player player, Block inspectedBlock, Claim claim) + { + super(player); + + this.inspectedBlock = inspectedBlock; + if (claim != null) + { + this.claims = Collections.singleton(claim); + } + else + { + this.claims = null; + } + this.inspectingNearbyClaims = false; } /** @@ -45,7 +57,8 @@ public class ClaimInspectionEvent extends PlayerEvent implements Cancellable * @param claims The list of claims involved * @param inspectingNearbyClaims Whether or not the user is inspecting nearby claims ("shift-clicking") */ - public ClaimInspectionEvent(Player player, Block inspectedBlock, Collection claims, boolean inspectingNearbyClaims) { + public ClaimInspectionEvent(Player player, Block inspectedBlock, Collection claims, boolean inspectingNearbyClaims) + { super(player); this.inspectedBlock = inspectedBlock; this.claims = claims;