TFM is now lib free! (#98)

- Remove lib folder
- Add a WorldEdit redo for future usage
This commit is contained in:
Telesphoreo 2018-07-26 00:35:31 -07:00 committed by Seth
parent 7a2b7ec78b
commit fb7c17aff7
5 changed files with 33 additions and 7 deletions

Binary file not shown.

View File

@ -48,6 +48,7 @@
<id>ess-repo</id> <id>ess-repo</id>
<url>http://repo.ess3.net</url> <url>http://repo.ess3.net</url>
</repository> </repository>
<repository> <repository>
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
@ -74,6 +75,11 @@
<url>http://jcenter.bintray.com</url> <url>http://jcenter.bintray.com</url>
</repository> </repository>
<repository>
<id>robomwm</id>
<url>https://dl.bintray.com/robomwm/maven</url>
</repository>
<repository> <repository>
<id>md_5-public</id> <id>md_5-public</id>
<url>http://repo.md-5.net/content/groups/public/</url> <url>http://repo.md-5.net/content/groups/public/</url>
@ -158,8 +164,7 @@
<groupId>net.coreprotect</groupId> <groupId>net.coreprotect</groupId>
<artifactId>CoreProtect</artifactId> <artifactId>CoreProtect</artifactId>
<version>2.14.2</version> <version>2.14.2</version>
<scope>system</scope> <scope>provided</scope>
<systemPath>${project.basedir}/lib/CoreProtect_2.14.2.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -57,6 +57,29 @@ public class WorldEditBridge extends FreedomService
} }
} }
public void redo(Player player, int count)
{
try
{
LocalSession session = getPlayerSession(player);
if (session != null)
{
final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
if (bukkitPlayer != null)
{
for (int i = 0; i < count; i++)
{
session.redo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
}
}
}
}
catch (Exception ex)
{
FLog.severe(ex);
}
}
private WorldEditPlugin getWorldEditPlugin() private WorldEditPlugin getWorldEditPlugin()
{ {
if (worldedit == null) if (worldedit == null)

View File

@ -1,19 +1,18 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import java.util.ArrayList;
import java.util.List;
import me.totalfreedom.totalfreedommod.banning.Ban; import me.totalfreedom.totalfreedommod.banning.Ban;
import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.punishments.Punishment; import me.totalfreedom.totalfreedommod.punishments.Punishment;
import me.totalfreedom.totalfreedommod.punishments.PunishmentType; import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import net.pravian.aero.util.Ips;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.List;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true) @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
@ -131,7 +130,6 @@ public class Command_glist extends FreedomCommand
plugin.bm.removeBan(playerUnban); plugin.bm.removeBan(playerUnban);
} }
} }
return true; return true;
case "nameban": case "nameban":
case "banname": case "banname":

View File

@ -95,7 +95,7 @@ public class Command_gtfo extends FreedomCommand
} }
} }
//checks if there is CoreProtect loaded and installed , if not it skips the rollback and uses coreprotect directly //checks if there is CoreProtect loaded and installed, if not it skips the rollback and uses CoreProtect directly
if (!cancelRollback) if (!cancelRollback)
{ {
if (!plugin.cpb.isEnabled()) if (!plugin.cpb.isEnabled())