mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2025-07-01 12:36:41 +00:00
sIgNifICanT buG FixEs (#105)
- Ignore totalfreedom.iml (people who clone from Git get this instead of TotalFreedomMod) - Essentials check before running /denick - Revise grammar in /invis - WorldEdit check for /setl (since W/E is no longer a required dependency) - WorldEdit check for /gtfo - WorldEdit check for /unban - Refactor -> LibsDisguiseBridge: isPluginEnabled -> isEnabled - Remove unneccesary ChatColor in /wiperegions - Use BlockData in Trailer - Revise /wiewarps grammar
This commit is contained in:
@ -1,6 +1,7 @@
|
||||
package me.totalfreedom.totalfreedommod.bridge;
|
||||
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
import com.sk89q.worldedit.WorldEdit;
|
||||
import com.sk89q.worldedit.bukkit.BukkitPlayer;
|
||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||
import me.totalfreedom.totalfreedommod.FreedomService;
|
||||
@ -14,7 +15,7 @@ public class WorldEditBridge extends FreedomService
|
||||
|
||||
private final WorldEditListener listener;
|
||||
//
|
||||
private WorldEditPlugin worldedit = null;
|
||||
private WorldEditPlugin worldeditPlugin = null;
|
||||
|
||||
public WorldEditBridge(TotalFreedomMod plugin)
|
||||
{
|
||||
@ -34,6 +35,30 @@ public class WorldEditBridge extends FreedomService
|
||||
listener.unregister();
|
||||
}
|
||||
|
||||
private WorldEditPlugin getWorldEditPlugin()
|
||||
{
|
||||
if (worldeditPlugin == null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Plugin we = server.getPluginManager().getPlugin("WorldEdit");
|
||||
if (we != null)
|
||||
{
|
||||
if (we instanceof WorldEditPlugin)
|
||||
{
|
||||
worldeditPlugin = (WorldEditPlugin) we;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
FLog.severe(ex);
|
||||
}
|
||||
}
|
||||
|
||||
return worldeditPlugin;
|
||||
}
|
||||
|
||||
public void undo(Player player, int count)
|
||||
{
|
||||
try
|
||||
@ -80,30 +105,6 @@ public class WorldEditBridge extends FreedomService
|
||||
}
|
||||
}
|
||||
|
||||
private WorldEditPlugin getWorldEditPlugin()
|
||||
{
|
||||
if (worldedit == null)
|
||||
{
|
||||
try
|
||||
{
|
||||
Plugin we = server.getPluginManager().getPlugin("WorldEdit");
|
||||
if (we != null)
|
||||
{
|
||||
if (we instanceof WorldEditPlugin)
|
||||
{
|
||||
worldedit = (WorldEditPlugin) we;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
FLog.severe(ex);
|
||||
}
|
||||
}
|
||||
|
||||
return worldedit;
|
||||
}
|
||||
|
||||
public void setLimit(Player player, int limit)
|
||||
{
|
||||
try
|
||||
@ -158,4 +159,21 @@ public class WorldEditBridge extends FreedomService
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isWorldEditEnabled()
|
||||
{
|
||||
try
|
||||
{
|
||||
WorldEditPlugin worldedit = getWorldEditPlugin();
|
||||
if (worldedit != null)
|
||||
{
|
||||
return worldedit.isEnabled();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
FLog.severe(ex);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user