From cd75819c3937ec7814e3d61bbe5445fbc5071d89 Mon Sep 17 00:00:00 2001
From: Indyuce <cym.peyrat@yahoo.fr>
Date: Fri, 25 Feb 2022 22:44:07 +0100
Subject: [PATCH] Stop with these playerData null checks

---
 .../Indyuce/mmoitems/api/player/PlayerData.java   | 15 ++-------------
 .../Indyuce/mmoitems/listener/PlayerListener.java |  3 ---
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java
index f9e80e07..88b524b7 100644
--- a/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java
+++ b/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java
@@ -414,19 +414,8 @@ public class PlayerData {
     }
 
     @NotNull
-    public static PlayerData get(@NotNull UUID uuid) {
-
-        // Might not be null, after all
-        PlayerData observedData = data.get(uuid);
-        if (observedData != null) {
-            return observedData;
-        }
-
-        // Attempt to load
-        load(uuid);
-
-        // Yes
-        return Objects.requireNonNull(data.get(uuid), "Could not obtain PlayerData. Please make sure the plugin initialized correctly.");
+    public static PlayerData get(UUID uuid) {
+        return Objects.requireNonNull(data.get(uuid), "Player data not loaded");
     }
 
     /**
diff --git a/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java b/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java
index 784cfbe2..8a8e60f7 100644
--- a/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java
+++ b/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java
@@ -249,9 +249,6 @@ public class PlayerListener implements Listener {
     @EventHandler
     public void onArmorEquip(ArmorEquipEvent event) {
         Player player = event.getPlayer();
-        if (!PlayerData.has(player))
-            return;
-
         NBTItem item = NBTItem.get(event.getNewArmorPiece());
         if (!PlayerData.get(player).getRPG().canUse(item, true))
             event.setCancelled(true);