MassiveCore - MassivePlugin and Active

This commit is contained in:
Olof Larsson
2016-02-25 22:28:09 +01:00
parent ce6a98e27d
commit 1f5e591ce6
38 changed files with 234 additions and 361 deletions

View File

@@ -7,14 +7,11 @@ import java.util.Map;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.plugin.Plugin;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MFlag;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.event.EventFactionsChunksChange;
import com.massivecraft.massivecore.EngineAbstract;
import com.massivecraft.massivecore.Engine;
import com.massivecraft.massivecore.ps.PS;
import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
@@ -22,7 +19,7 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
public class EngineWorldGuard extends EngineAbstract
public class EngineWorldGuard extends Engine
{
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
@@ -30,7 +27,6 @@ public class EngineWorldGuard extends EngineAbstract
private static EngineWorldGuard i = new EngineWorldGuard();
public static EngineWorldGuard get() { return i; }
private EngineWorldGuard() {}
// -------------------------------------------- //
// FIELDS
@@ -43,25 +39,16 @@ public class EngineWorldGuard extends EngineAbstract
// -------------------------------------------- //
@Override
public Plugin getPlugin()
public void setActiveInner(boolean active)
{
return Factions.get();
}
@Override
public void activate()
{
this.worldGuard = (WorldGuardPlugin) Bukkit.getPluginManager().getPlugin("WorldGuard");
super.activate();
}
@Override
public void deactivate()
{
this.worldGuard = null;
super.deactivate();
if (active)
{
this.worldGuard = (WorldGuardPlugin) Bukkit.getPluginManager().getPlugin("WorldGuard");
}
else
{
this.worldGuard = null;
}
}
// -------------------------------------------- //

View File

@@ -1,8 +1,9 @@
package com.massivecraft.factions.integration.worldguard;
import com.massivecraft.massivecore.integration.IntegrationAbstract;
import com.massivecraft.massivecore.Engine;
import com.massivecraft.massivecore.Integration;
public class IntegrationWorldGuard extends IntegrationAbstract
public class IntegrationWorldGuard extends Integration
{
// -------------------------------------------- //
// INSTANCE & CONSTRUCT
@@ -10,22 +11,19 @@ public class IntegrationWorldGuard extends IntegrationAbstract
private static IntegrationWorldGuard i = new IntegrationWorldGuard();
public static IntegrationWorldGuard get() { return i; }
private IntegrationWorldGuard() { super("WorldGuard"); }
private IntegrationWorldGuard()
{
this.setPluginName("WorldGuard");
}
// -------------------------------------------- //
// OVERRIDE
// -------------------------------------------- //
@Override
public void activate()
public Engine getEngine()
{
EngineWorldGuard.get().activate();
}
@Override
public void deactivate()
{
EngineWorldGuard.get().deactivate();
return EngineWorldGuard.get();
}
}