From dcd167d4e0246b639eeb7a8a62ab1e6696bfc989 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Thu, 2 Feb 2012 15:20:43 -0600 Subject: [PATCH] WorldGuard integration is now disabled, since it has been broken for quite some time now and nobody who used it has been interested enough to actually fix it. The code is left in though, just in case somebody finally decides to fix it. We'll probably strip the code out eventually if it remains unfixed. --- src/com/massivecraft/factions/P.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java index 8dfc6046..2cd9fb6b 100644 --- a/src/com/massivecraft/factions/P.java +++ b/src/com/massivecraft/factions/P.java @@ -2,6 +2,7 @@ package com.massivecraft.factions; import java.lang.reflect.Modifier; import java.lang.reflect.Type; +import java.util.logging.Level; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -23,7 +24,7 @@ import com.massivecraft.factions.cmd.*; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.SpoutFeatures; -import com.massivecraft.factions.integration.Worldguard; +//import com.massivecraft.factions.integration.Worldguard; import com.massivecraft.factions.listeners.FactionsBlockListener; import com.massivecraft.factions.listeners.FactionsChatEarlyListener; import com.massivecraft.factions.listeners.FactionsEntityListener; @@ -42,6 +43,7 @@ import com.google.gson.reflect.TypeToken; import com.massivecraft.factions.integration.EssentialsFeatures; import com.massivecraft.factions.integration.capi.CapiFeatures; + public class P extends MPlugin { // Our single plugin instance @@ -104,7 +106,9 @@ public class P extends MPlugin if(Conf.worldGuardChecking) { - Worldguard.init(this); + this.log(Level.WARNING, "Our WorldGuard integration is broken with current versions of WorldGuard, so it is disabled. If you are a plugin dev and want to try your hand at fixing it, be our guest."); + Conf.worldGuardChecking = false; +// Worldguard.init(this); } // Register Event Handlers