From 2fb3d6930769de2bea92b208e6cf5f2341a8612d Mon Sep 17 00:00:00 2001 From: Ethan Date: Wed, 24 Mar 2021 07:35:26 -0400 Subject: [PATCH] null checks --- .../Indyuce/mmoitems/api/edition/input/ChatEdition.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/Indyuce/mmoitems/api/edition/input/ChatEdition.java b/src/main/java/net/Indyuce/mmoitems/api/edition/input/ChatEdition.java index ebb2eac9..87e345d8 100644 --- a/src/main/java/net/Indyuce/mmoitems/api/edition/input/ChatEdition.java +++ b/src/main/java/net/Indyuce/mmoitems/api/edition/input/ChatEdition.java @@ -1,5 +1,7 @@ package net.Indyuce.mmoitems.api.edition.input; +import net.Indyuce.mmoitems.MMOItems; +import net.Indyuce.mmoitems.api.edition.Edition; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -8,9 +10,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.player.AsyncPlayerChatEvent; -import net.Indyuce.mmoitems.MMOItems; -import net.Indyuce.mmoitems.api.edition.Edition; - public class ChatEdition extends PlayerInputHandler implements Listener { /** @@ -29,9 +28,9 @@ public class ChatEdition extends PlayerInputHandler implements Listener { HandlerList.unregisterAll(this); } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) public void a(AsyncPlayerChatEvent event) { - if (event.getPlayer().equals(getPlayer())) { + if (getPlayer() != null && event.getPlayer().equals(getPlayer())) { event.setCancelled(true); registerInput(event.getMessage()); }