From eec60b2d5c0440cb78dc6071caf5bc2eef87b883 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Fri, 3 Feb 2012 00:15:35 -0600 Subject: [PATCH] Release 1.6.5b - re-enabled WorldGuard support. It actually was working, who knew? I don't use WorldGuard, and I'd only seen multiple failure reports lately and not a single indication from anyone that the integration was actually working for them, so... --- plugin.yml | 2 +- src/com/massivecraft/factions/P.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugin.yml b/plugin.yml index 2ae4093c..2395512a 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: Factions -version: 1.6.5 +version: 1.6.5b main: com.massivecraft.factions.P authors: [Olof Larsson, Brett Flannigan] softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag] diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java index e2e296ac..b2699ece 100644 --- a/src/com/massivecraft/factions/P.java +++ b/src/com/massivecraft/factions/P.java @@ -22,7 +22,7 @@ import com.massivecraft.factions.integration.EssentialsFeatures; import com.massivecraft.factions.integration.EssentialsOldVersionFeatures; 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.integration.capi.CapiFeatures; import com.massivecraft.factions.listeners.FactionsBlockListener; import com.massivecraft.factions.listeners.FactionsChatEarlyListener; @@ -102,9 +102,7 @@ public class P extends MPlugin if(Conf.worldGuardChecking) { - 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); + Worldguard.init(this); } // Register Event Handlers