From fbf7bba09e28c03a132786bcb19227bf6475a363 Mon Sep 17 00:00:00 2001 From: David Berdik Date: Sun, 19 Mar 2017 20:32:16 -0400 Subject: [PATCH] Removed support for the Residence plugin --- .classpath | 1 - .../theprogrammersworld/herobrine/Support.java | 10 ---------- .../herobrine/hooks/ResidenceHook.java | 17 ----------------- 3 files changed, 28 deletions(-) delete mode 100644 src/net/theprogrammersworld/herobrine/hooks/ResidenceHook.java diff --git a/.classpath b/.classpath index 989c61a..a079a28 100644 --- a/.classpath +++ b/.classpath @@ -6,7 +6,6 @@ - diff --git a/src/net/theprogrammersworld/herobrine/Support.java b/src/net/theprogrammersworld/herobrine/Support.java index c96faa4..c5b2a1a 100644 --- a/src/net/theprogrammersworld/herobrine/Support.java +++ b/src/net/theprogrammersworld/herobrine/Support.java @@ -4,7 +4,6 @@ import net.theprogrammersworld.herobrine.hooks.CustomItemsHook; import net.theprogrammersworld.herobrine.hooks.FactionsHook; import net.theprogrammersworld.herobrine.hooks.GriefPreventionHook; import net.theprogrammersworld.herobrine.hooks.PreciousStonesHook; -import net.theprogrammersworld.herobrine.hooks.ResidenceHook; import net.theprogrammersworld.herobrine.hooks.TownyHook; import net.theprogrammersworld.herobrine.hooks.WorldGuardHook; @@ -19,7 +18,6 @@ public class Support { private boolean B_CustomItems = false; private boolean B_PreciousStones; private boolean B_Factions; - private ResidenceHook ResidenceCore; private GriefPreventionHook GriefPreventionCore; private TownyHook TownyCore; private WorldGuardHook WorldGuard; @@ -28,7 +26,6 @@ public class Support { private FactionsHook Factions; public Support() { - ResidenceCore = new ResidenceHook(); GriefPreventionCore = new GriefPreventionHook(); TownyCore = new TownyHook(); CustomItems = new CustomItemsHook(); @@ -68,10 +65,6 @@ public class Support { } public void CheckForPlugins() { - if (ResidenceCore.Check()) { - B_Residence = true; - Herobrine.log.info("[Herobrine] Residence plugin detected on server"); - } if (GriefPreventionCore.Check()) { B_GriefPrevention = true; Herobrine.log.info("[Herobrine] GriefPrevention plugin detected on server"); @@ -100,9 +93,6 @@ public class Support { } public boolean isSecuredArea(final Location loc) { - if (B_Residence) { - return ResidenceCore.isSecuredArea(loc); - } if (B_GriefPrevention) { return GriefPreventionCore.isSecuredArea(loc); } diff --git a/src/net/theprogrammersworld/herobrine/hooks/ResidenceHook.java b/src/net/theprogrammersworld/herobrine/hooks/ResidenceHook.java deleted file mode 100644 index d689d07..0000000 --- a/src/net/theprogrammersworld/herobrine/hooks/ResidenceHook.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.theprogrammersworld.herobrine.hooks; - -import com.bekvon.bukkit.residence.*; -import org.bukkit.Bukkit; -import org.bukkit.Location; - -public class ResidenceHook { - - public boolean Check() { - return Bukkit.getServer().getPluginManager().getPlugin("Residence") != null; - } - - public boolean isSecuredArea(final Location loc) { - return Residence.getResidenceManager().getByLoc(loc) != null; - } - -} \ No newline at end of file