webadmin/WorldGuardWrapper
1
0
Fork 0
forked from clone/WorldGuardWrapper
Code Pull Requests Activity

Fix platform not being ready at instantiation

Browse Source
This commit is contained in:
Eric 2018-08-03 18:03:26 +02:00
parent c9e5d0a65a
commit 0c055fd044
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
implementation/v7/src/main/java/org/codemc/worldguardwrapper/implementation/v7/WorldGuardImplementation.java
View File

@ -11,7 +11,6 @@ import com.sk89q.worldedit.bukkit.BukkitWorld;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.internal.platform.WorldGuardPlatform;
import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.flags.Flag; import com.sk89q.worldguard.protection.flags.Flag;
import com.sk89q.worldguard.protection.flags.FlagContext; import com.sk89q.worldguard.protection.flags.FlagContext;
@ -21,7 +20,6 @@ import com.sk89q.worldguard.protection.flags.registry.FlagConflictException;
import com.sk89q.worldguard.protection.flags.registry.FlagRegistry; import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionContainer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -36,15 +34,13 @@ import lombok.NonNull;
public class WorldGuardImplementation extends AbstractWorldGuardImplementation { public class WorldGuardImplementation extends AbstractWorldGuardImplementation {
private final WorldGuard core;
private final FlagRegistry flagRegistry; private final FlagRegistry flagRegistry;
private final RegionContainer container;
private final WorldGuardPlugin plugin; private final WorldGuardPlugin plugin;
public WorldGuardImplementation() { public WorldGuardImplementation() {
WorldGuard core = WorldGuard.getInstance(); core = WorldGuard.getInstance();
flagRegistry = core.getFlagRegistry(); flagRegistry = core.getFlagRegistry();
WorldGuardPlatform platform = core.getPlatform();
container = platform.getRegionContainer();
plugin = WorldGuardPlugin.inst(); plugin = WorldGuardPlugin.inst();
} }
@ -57,7 +53,7 @@ public class WorldGuardImplementation extends AbstractWorldGuardImplementation {
} }
private Optional<RegionManager> getWorldManager(@NonNull World world) { private Optional<RegionManager> getWorldManager(@NonNull World world) {
return Optional.ofNullable(container.get(BukkitAdapter.adapt(world))); return Optional.ofNullable(core.getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world)));
} }
private Optional<ApplicableRegionSet> getApplicableRegions(@NonNull Location location) { private Optional<ApplicableRegionSet> getApplicableRegions(@NonNull Location location) {
@ -167,7 +163,7 @@ public class WorldGuardImplementation extends AbstractWorldGuardImplementation {
@Override @Override
public Map<String, AbstractRegion> getRegions(World world) { public Map<String, AbstractRegion> getRegions(World world) {
RegionManager regionManager = container.get(new BukkitWorld(world)); RegionManager regionManager = core.getPlatform().getRegionContainer().get(new BukkitWorld(world));
Map<String, ProtectedRegion> regions = regionManager.getRegions(); Map<String, ProtectedRegion> regions = regionManager.getRegions();
Map<String, AbstractRegion> map = new HashMap<>(); Map<String, AbstractRegion> map = new HashMap<>();