From 38f891ca9897b4793a7e0556eab0f22938d3b959 Mon Sep 17 00:00:00 2001
From: LinoxGH <54643600+LinoxGH@users.noreply.github.com>
Date: Sun, 4 Oct 2020 09:01:24 +0300
Subject: [PATCH] Some code improvements.

(at least that's what was meant to be done)
---
 .../slimefun4/implementation/setup/ResearchSetup.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
index cc7e85901..56ef82b3a 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
@@ -24,6 +24,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
  */
 public final class ResearchSetup {
 
+    private static SlimefunPlugin plugin = null;
     private static boolean alreadyRan = false;
 
     private ResearchSetup() {}
@@ -32,6 +33,11 @@ public final class ResearchSetup {
         if (alreadyRan) {
             throw new UnsupportedOperationException("Researches can only be registered once!");
         }
+        
+        plugin = SlimefunPlugin.instance();
+        if (plugin == null) {
+            throw new Exception("Plugin cannot be null!");
+        }
 
         alreadyRan = true;
 
@@ -281,11 +287,11 @@ public final class ResearchSetup {
         register("even_higher_tier_capacitors", 266, "Tier 3 Capacitors", 40, SlimefunItems.ENERGIZED_CAPACITOR);
         register("caveman_talisman", 267, "Talisman of the Caveman", 20, SlimefunItems.TALISMAN_CAVEMAN);
         register("energy_connectors", 268, "Wired Connections", 12, SlimefunItems.ENERGY_CONNECTOR);
+        
+        plugin = null;
     }
 
     private static void register(@Nonnull String key, int id, @Nonnull String name, int defaultCost, @Nonnull ItemStack... items) {
-        SlimefunPlugin plugin = SlimefunPlugin.instance();
-        if (plugin == null) return;
         Research research = new Research(new NamespacedKey(plugin, key), id, name, defaultCost);
 
         for (ItemStack item : items) {