This commit is contained in:
ZeroEpoch1969
2018-12-29 12:41:48 -07:00
parent 7a43f991e3
commit 72db71b3cf
16 changed files with 187 additions and 61 deletions

View File

@ -2,8 +2,7 @@ package me.totalfreedom.totalfreedommod.bridge;
import me.libraryaddict.disguise.DisguiseAPI;
import me.libraryaddict.disguise.LibsDisguises;
import me.totalfreedom.libsdisguise.DisallowedDisguises;
import me.totalfreedom.libsdisguise.TF_DisguiseAPI;
import me.totalfreedom.disguise.DisguiseBlocker;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.util.FLog;
@ -109,19 +108,12 @@ public class LibsDisguisesBridge extends FreedomService
return;
}
if (state)
{
TF_DisguiseAPI.enableDisguises();
}
else
{
TF_DisguiseAPI.disableDisguises();
}
libsDisguises.toggleUsability(state);
}
public boolean isDisguisesEnabled()
{
return !DisallowedDisguises.disabled;
return DisguiseBlocker.enabled;
}
public boolean isEnabled()

View File

@ -70,7 +70,8 @@ public class WorldEditBridge extends FreedomService
{
for (int i = 0; i < count; i++)
{
session.undo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
session.undo(session.getBlockBag(fuckyou), fuckyou);
}
}
}
@ -93,7 +94,8 @@ public class WorldEditBridge extends FreedomService
{
for (int i = 0; i < count; i++)
{
session.redo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
session.redo(session.getBlockBag(fuckyou), fuckyou);
}
}
}
@ -121,6 +123,30 @@ public class WorldEditBridge extends FreedomService
}
public int getDefaultLimit()
{
final WorldEditPlugin wep = getWorldEditPlugin();
if (wep == null)
{
return 0;
}
return wep.getLocalConfiguration().defaultChangeLimit;
}
public int getMaxLimit()
{
final WorldEditPlugin wep = getWorldEditPlugin();
if (wep == null)
{
return 0;
}
return wep.getLocalConfiguration().maxChangeLimit;
}
private LocalSession getPlayerSession(Player player)
{
final WorldEditPlugin wep = getWorldEditPlugin();