From 208d5d18b1abb284254c9603f7cc762c592d5845 Mon Sep 17 00:00:00 2001 From: Indyuce Date: Thu, 19 Mar 2020 15:47:49 +0100 Subject: [PATCH] Fixed MM compatibility --- .../java/net/Indyuce/mmocore/MMOCore.java | 9 ++++--- .../mythicmobs/MythicMobsEnableListener.java | 26 ------------------- 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsEnableListener.java diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java index ab7c053a..18e7139c 100644 --- a/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -38,7 +38,7 @@ import net.Indyuce.mmocore.comp.holograms.CMIPlugin; import net.Indyuce.mmocore.comp.holograms.HologramSupport; import net.Indyuce.mmocore.comp.holograms.HologramsPlugin; import net.Indyuce.mmocore.comp.holograms.HolographicDisplaysPlugin; -import net.Indyuce.mmocore.comp.mythicmobs.MythicMobsEnableListener; +import net.Indyuce.mmocore.comp.mythicmobs.MythicMobsDrops; import net.Indyuce.mmocore.comp.mythicmobs.MythicMobsMMOLoader; import net.Indyuce.mmocore.comp.placeholder.DefaultParser; import net.Indyuce.mmocore.comp.placeholder.PlaceholderAPIParser; @@ -177,8 +177,6 @@ public class MMOCore extends JavaPlugin { if (getConfig().contains("mysql") && getConfig().getBoolean("mysql.enabled")) dataProvider = new MySQLDataProvider(); - Bukkit.getPluginManager().registerEvents(new MythicMobsEnableListener(), this); - if (Bukkit.getPluginManager().getPlugin("Vault") != null) economy = new VaultEconomy(); @@ -214,6 +212,11 @@ public class MMOCore extends JavaPlugin { getLogger().log(Level.INFO, "Hooked onto ShopKeepers"); } + if (Bukkit.getPluginManager().getPlugin("MythicMobs") != null) { + Bukkit.getServer().getPluginManager().registerEvents(new MythicMobsDrops(), this); + MMOCore.plugin.getLogger().log(Level.INFO, "Hooked onto MythicMobs"); + } + if (Bukkit.getPluginManager().getPlugin("MyPet") != null) { entities.registerHandler(new MyPetEntityHandler()); getLogger().log(Level.INFO, "Hooked onto MyPet"); diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsEnableListener.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsEnableListener.java deleted file mode 100644 index 148aa63f..00000000 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsEnableListener.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.Indyuce.mmocore.comp.mythicmobs; -//package fuck.im.so.dead; - -import java.util.logging.Level; - -//import plz.dont.hurt.me.Indy; -import org.bukkit.Bukkit; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.server.PluginEnableEvent; - -import net.Indyuce.mmocore.MMOCore; -//Wooooow - -public class MythicMobsEnableListener /**This is for fixing a bug, not just stupid code, plz plz plz*/ implements Listener /**here my lovely indy, it's a bug fix*/ { - @EventHandler //For handling this very cool class - public void iloveyoupleasedonthurtme(PluginEnableEvent /**See this event is super cool, but I understand why you'd dislike this "fix"*/ imsorryindy) { - if (imsorryindy.getPlugin().getName().equals("MythicMobs")) /**The load order issue isn't caused by anyone, but I wish we could have an easier fix*/ { - Bukkit.getServer().getPluginManager().registerEvents(new MythicMobsDrops(), MMOCore.plugin); - //Can you even safely register an event within a listener and an eventhandler method?? I don't know, but it works for now! - MMOCore.plugin.getLogger().log(Level.INFO, "Hooked onto MythicMobs"); //PLEASE LOG MY DEATH WHEN INDY SLITS MY THROAT, I'M SCARED - } - } -} - -//Love from Aria \ No newline at end of file