From 1e25f35aaceed1ca7a95c25863d0b9c93ff818dd Mon Sep 17 00:00:00 2001
From: extendedclip <fairviewent@yahoo.com>
Date: Sun, 5 May 2019 10:37:54 -0400
Subject: [PATCH] Remove ServerLoadEvent listener

---
 .../placeholderapi/PlaceholderListener.java   | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderListener.java b/src/main/java/me/clip/placeholderapi/PlaceholderListener.java
index b46a1a2..7c06084 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderListener.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderListener.java
@@ -29,7 +29,6 @@ import me.clip.placeholderapi.expansion.Cleanable;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.expansion.Taskable;
 import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import me.clip.placeholderapi.external.EZPlaceholderHook;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -37,7 +36,6 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.ServerLoadEvent;
 
 
 public class PlaceholderListener implements Listener {
@@ -49,12 +47,6 @@ public class PlaceholderListener implements Listener {
     Bukkit.getPluginManager().registerEvents(this, instance);
   }
 
-  @EventHandler
-  public void onServerLoad(ServerLoadEvent e) {
-    plugin.getLogger().info("Placeholder expansion registration initializing...");
-    plugin.getExpansionManager().registerAllExpansions();
-  }
-
   @EventHandler
   public void onExpansionUnregister(ExpansionUnregisterEvent event) {
 
@@ -101,22 +93,7 @@ public class PlaceholderListener implements Listener {
 
       PlaceholderHook i = hook.getValue();
 
-      if (i instanceof EZPlaceholderHook) {
-
-        EZPlaceholderHook h = (EZPlaceholderHook) i;
-
-        if (h.getPluginName() == null) {
-          continue;
-        }
-
-        if (h.getPluginName().equalsIgnoreCase(n)) {
-          if (PlaceholderAPI.unregisterPlaceholderHook(hook.getKey())) {
-            plugin.getLogger()
-                .info("Unregistered placeholder hook for placeholder: " + h.getPlaceholderName());
-            break;
-          }
-        }
-      } else if (i instanceof PlaceholderExpansion) {
+      if (i instanceof PlaceholderExpansion) {
 
         PlaceholderExpansion ex = (PlaceholderExpansion) i;