From ba7a748efde8bca67ba657a67b2f9de9fb957110 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 22 Jan 2021 19:29:11 +0000
Subject: [PATCH] Re-fixed the rework of the fix of the changed fix of the fix

---
 .../v1_15_R1/PacketPlayOutRecipeUpdateFix.java      |  2 ++
 .../main/java/com/willfp/eco/spigot/EcoPlugin.java  |  2 --
 .../willfp/eco/util/plugin/AbstractEcoPlugin.java   | 13 +++++--------
 .../com/willfp/eco/util/recipe/RecipeManager.java   |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/PacketPlayOutRecipeUpdateFix.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/PacketPlayOutRecipeUpdateFix.java
index 2114377b..20c493a4 100644
--- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/PacketPlayOutRecipeUpdateFix.java
+++ b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/eco/proxy/v1_15_R1/PacketPlayOutRecipeUpdateFix.java
@@ -3,6 +3,8 @@ package com.willfp.eco.proxy.v1_15_R1;
 import com.willfp.eco.proxy.proxies.PacketPlayOutRecipeUpdateFixProxy;
 import net.minecraft.server.v1_15_R1.IRecipe;
 import net.minecraft.server.v1_15_R1.PacketPlayOutRecipeUpdate;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java
index 55c3d7e6..87464ce3 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java
@@ -27,7 +27,6 @@ import com.willfp.eco.util.integrations.anticheat.AnticheatManager;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.plugin.AbstractEcoPlugin;
 import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
-import com.willfp.eco.util.recipe.RecipeListener;
 import lombok.Getter;
 import org.bukkit.event.Listener;
 
@@ -57,7 +56,6 @@ public class EcoPlugin extends AbstractEcoPlugin {
         this.getEventManager().registerListener(new ArmorListener());
         this.getEventManager().registerListener(new DispenserArmorListener());
         this.getEventManager().registerListener(new EntityDeathByEntityListeners(this));
-        this.getEventManager().registerListener(new RecipeListener(this));
         ProtocolLibrary.getProtocolManager().addPacketListener(new PacketPlayOutRecipeUpdateFix(this));
     }
 
diff --git a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java
index 670f2061..25567894 100644
--- a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java
+++ b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java
@@ -250,14 +250,11 @@ public abstract class AbstractEcoPlugin extends JavaPlugin {
 
         Prerequisite.update();
 
-
-        if (ClassUtils.exists("com.comphenix.protocol.events.PacketAdapter")) {
-            this.getPacketAdapters().forEach(abstractPacketAdapter -> {
-                if (!abstractPacketAdapter.isPostLoad()) {
-                    abstractPacketAdapter.register();
-                }
-            });
-        }
+        this.getPacketAdapters().forEach(abstractPacketAdapter -> {
+            if (!abstractPacketAdapter.isPostLoad()) {
+                abstractPacketAdapter.register();
+            }
+        });
 
         updatableClasses.addAll(this.getUpdatableClasses());
 
diff --git a/eco-util/src/main/java/com/willfp/eco/util/recipe/RecipeManager.java b/eco-util/src/main/java/com/willfp/eco/util/recipe/RecipeManager.java
index e0754418..db60f9ac 100644
--- a/eco-util/src/main/java/com/willfp/eco/util/recipe/RecipeManager.java
+++ b/eco-util/src/main/java/com/willfp/eco/util/recipe/RecipeManager.java
@@ -52,8 +52,8 @@ public class RecipeManager extends PluginDependent {
             displayedRecipe.setIngredient(character, new RecipeChoice.ExactChoice(recipe.getDisplayedAtIndex(i)));
         }
 
-        Bukkit.getServer().addRecipe(displayedRecipe);
         Bukkit.getServer().addRecipe(shapedRecipe);
+        Bukkit.getServer().addRecipe(displayedRecipe);
     }
 
     /**