From 275f497dffce1ee8030221358dba0db6fe1a4b9c Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 2 Aug 2018 01:29:04 +0200
Subject: [PATCH] Add getter for WG main class

---
 .../implementation/IWorldGuardImplementation.java    |  3 +++
 .../implementation/v6/WorldGuardImplementation.java  |  6 ++++++
 .../implementation/v7/WorldGuardImplementation.java  | 12 ++++++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/implementation/interface/src/main/java/org/codemc/worldguardwrapper/implementation/IWorldGuardImplementation.java b/implementation/interface/src/main/java/org/codemc/worldguardwrapper/implementation/IWorldGuardImplementation.java
index c815136..70565e6 100644
--- a/implementation/interface/src/main/java/org/codemc/worldguardwrapper/implementation/IWorldGuardImplementation.java
+++ b/implementation/interface/src/main/java/org/codemc/worldguardwrapper/implementation/IWorldGuardImplementation.java
@@ -3,11 +3,14 @@ package org.codemc.worldguardwrapper.implementation;
 import lombok.NonNull;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.Optional;
 
 public interface IWorldGuardImplementation {
 
+    JavaPlugin getWorldGuardPlugin();
+
     int getApiVersion();
 
     // String flag
diff --git a/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/WorldGuardImplementation.java b/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/WorldGuardImplementation.java
index 0bc9418..bd57b0a 100644
--- a/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/WorldGuardImplementation.java
+++ b/implementation/v6/src/main/java/org/codemc/worldguardwrapper/implementation/v6/WorldGuardImplementation.java
@@ -13,6 +13,7 @@ import lombok.NonNull;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.codemc.worldguardwrapper.implementation.AbstractWorldGuardImplementation;
 
 import java.util.Optional;
@@ -47,6 +48,11 @@ public class WorldGuardImplementation extends AbstractWorldGuardImplementation {
         return getApplicableRegions(location).map(applicableRegions -> applicableRegions.queryState(wrapPlayer(player).orElse(null), stateFlags));
     }
 
+    @Override
+    public JavaPlugin getWorldGuardPlugin() {
+        return WorldGuardPlugin.inst();
+    }
+
     @Override
     public int getApiVersion() {
         return 6;
diff --git a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java
index 9f1fd8b..5fe5710 100644
--- a/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java
+++ b/implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java
@@ -17,22 +17,21 @@ import lombok.NonNull;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.codemc.worldguardwrapper.implementation.AbstractWorldGuardImplementation;
 
 import java.util.Optional;
 
 public class WorldGuardImplementation extends AbstractWorldGuardImplementation {
 
-    private final WorldGuard core;
     private final FlagRegistry flagRegistry;
-    private final WorldGuardPlatform platform;
     private final RegionContainer container;
     private final WorldGuardPlugin plugin;
 
     public WorldGuardImplementation() {
-        core = WorldGuard.getInstance();
+        WorldGuard core = WorldGuard.getInstance();
         flagRegistry = core.getFlagRegistry();
-        platform = core.getPlatform();
+        WorldGuardPlatform platform = core.getPlatform();
         container = platform.getRegionContainer();
         plugin = WorldGuardPlugin.inst();
     }
@@ -57,6 +56,11 @@ public class WorldGuardImplementation extends AbstractWorldGuardImplementation {
         return getApplicableRegions(location).map(applicableRegions -> applicableRegions.queryState(wrapPlayer(player).orElse(null), stateFlags));
     }
 
+    @Override
+    public JavaPlugin getWorldGuardPlugin() {
+        return WorldGuardPlugin.inst();
+    }
+
     @Override
     public int getApiVersion() {
         return 7;