From 3710031b80fbc9c051771d0b70ea8ed8d318c279 Mon Sep 17 00:00:00 2001 From: Driftay Date: Thu, 21 Nov 2019 09:10:04 -0500 Subject: [PATCH] Fixed World Guard Initiation --- src/main/java/com/massivecraft/factions/FactionsPlugin.java | 5 ++--- .../massivecraft/factions/zcore/persist/MemoryFPlayer.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java index 223ac265..0d8319ab 100755 --- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java +++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java @@ -89,6 +89,7 @@ public class FactionsPlugin extends MPlugin { private boolean mvdwPlaceholderAPIManager = false; private Listener[] eventsListener; public List itemList = getConfig().getStringList("fchest.Items-Not-Allowed"); + private Worldguard wg; public FactionsPlugin() { @@ -230,9 +231,7 @@ public class FactionsPlugin extends MPlugin { Econ.setup(); setupPermissions(); - if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) { - Worldguard.init(this); - } + if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) wg = new Worldguard(); EngineDynmap.getInstance().init(); diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index 4087f64f..d1e3a79c 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -817,7 +817,7 @@ public abstract class MemoryFPlayer implements FPlayer { int factionBuffer = FactionsPlugin.getInstance().getConfig().getInt("hcf.buffer-zone", 0); int worldBuffer = FactionsPlugin.getInstance().getConfig().getInt("world-border.buffer", 0); - if (Conf.worldGuardChecking && Worldguard.checkForRegionsInChunk(flocation) && !this.isAdminBypassing()) { + if (Conf.worldGuardChecking && Worldguard.getInstance().checkForRegionsInChunk(flocation) && !this.isAdminBypassing()) { // Checks for WorldGuard regions in the chunk attempting to be claimed error = FactionsPlugin.getInstance().txt.parse(TL.CLAIM_PROTECTED.toString()); } else if (flocation.isOutsideWorldBorder(FactionsPlugin.getInstance().getConfig().getInt("world-border.buffer", 0))) {