Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PlotSquared compiling issues

Browse Source
This commit is contained in:
MattBDev 2019-09-19 16:43:21 -04:00
parent c926cddbd6
commit 68c8fca672
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/CFIRedirect.java
View File

@ -13,6 +13,7 @@ import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3; import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import java.util.concurrent.CompletableFuture;
@CommandDeclaration( @CommandDeclaration(
command = "cfi", command = "cfi",
@ -32,7 +33,7 @@ public class CFIRedirect extends Command {
} }
@Override @Override
public void execute(final PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) throws CommandException { public CompletableFuture<Boolean> execute(final PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
checkTrue(args.length >= 1, Captions.COMMAND_SYNTAX, getUsage()); checkTrue(args.length >= 1, Captions.COMMAND_SYNTAX, getUsage());
final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT); final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
checkTrue(plot.isOwner(player.getUUID()), Captions.NOW_OWNER); checkTrue(plot.isOwner(player.getUUID()), Captions.NOW_OWNER);
@ -42,7 +43,8 @@ public class CFIRedirect extends Command {
player.sendMessage("The command has been changed to: //cfi"); player.sendMessage("The command has been changed to: //cfi");
} else { } else {
player.sendMessage("Must have the `worlds` component enabled in the PlotSquared config.yml"); player.sendMessage("Must have the `worlds` component enabled in the PlotSquared config.yml");
return; return CompletableFuture.completedFuture(false);
} }
return CompletableFuture.completedFuture(true);
} }
} }

7
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweChunkManager.java
View File

@ -13,6 +13,7 @@ import com.sk89q.worldedit.function.operation.Operations;
import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import java.util.concurrent.CompletableFuture;
public class FaweChunkManager extends ChunkManager { public class FaweChunkManager extends ChunkManager {
@ -28,13 +29,13 @@ public class FaweChunkManager extends ChunkManager {
} }
@Override @Override
public boolean loadChunk(String world, ChunkLoc loc, boolean force) { public CompletableFuture loadChunk(String world, ChunkLoc loc, boolean force) {
return parent.loadChunk(world, loc, force); return parent.loadChunk(world, loc, force);
} }
@Override @Override
public void unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe) { public void unloadChunk(String world, ChunkLoc loc, boolean save) {
parent.unloadChunk(world, loc, save, safe); parent.unloadChunk(world, loc, save);
} }
@Override @Override

5
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/FaweLocalBlockQueue.java
View File

@ -114,9 +114,10 @@ public class FaweLocalBlockQueue extends LocalBlockQueue {
} }
@Override @Override
public void enqueue() { public boolean enqueue() {
super.enqueue(); boolean val = super.enqueue();
IMP.enableQueue(); IMP.enableQueue();
return val;
} }
@Override @Override

10
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java
View File

@ -29,6 +29,7 @@ import com.sk89q.worldedit.world.biome.Biomes;
import com.sk89q.worldedit.world.registry.BiomeRegistry; import com.sk89q.worldedit.world.registry.BiomeRegistry;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
@CommandDeclaration( @CommandDeclaration(
@ -46,12 +47,12 @@ public class PlotSetBiome extends Command {
} }
@Override @Override
public void execute(final PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) throws CommandException { public CompletableFuture<Boolean> execute(final PlotPlayer player, String[] args, RunnableVal3<Command, Runnable, Runnable> confirm, RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT); final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
checkTrue(plot.isOwner(player.getUUID()) || Permissions.hasPermission(player, "plots.admin.command.generatebiome"), Captions.NO_PLOT_PERMS); checkTrue(plot.isOwner(player.getUUID()) || Permissions.hasPermission(player, "plots.admin.command.generatebiome"), Captions.NO_PLOT_PERMS);
if (plot.getRunning() != 0) { if (plot.getRunning() != 0) {
Captions.WAIT_FOR_TIMER.send(player); Captions.WAIT_FOR_TIMER.send(player);
return; return null;
} }
checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage()); checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
final HashSet<RegionWrapper> regions = plot.getRegions(); final HashSet<RegionWrapper> regions = plot.getRegions();
@ -59,10 +60,10 @@ public class PlotSetBiome extends Command {
Collection<BiomeType> knownBiomes = BiomeTypes.values(); Collection<BiomeType> knownBiomes = BiomeTypes.values();
final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry); final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry);
if (biome == null) { if (biome == null) {
String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATER.toString()); String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATOR.toString());
Captions.NEED_BIOME.send(player); Captions.NEED_BIOME.send(player);
MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.toString() + biomes); MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.toString() + biomes);
return; return CompletableFuture.completedFuture(false);
} }
confirm.run(this, new Runnable() { confirm.run(this, new Runnable() {
@Override @Override
@ -94,5 +95,6 @@ public class PlotSetBiome extends Command {
} }
}, null); }, null);
return CompletableFuture.completedFuture(true);
} }
} }