EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Alexander Söderberg 2020-07-17 17:39:41 +02:00 committed by Alexander Söderberg
parent 020b030667
commit 43d058d3db
8 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
View File

@ -64,10 +64,8 @@ import com.plotsquared.core.util.RegionManager;
import com.plotsquared.core.util.SchematicHandler;
import com.plotsquared.core.util.SetupUtils;
import com.plotsquared.core.util.WorldUtil;
import com.plotsquared.core.util.task.TaskTime;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.extension.platform.Actor;
import io.papermc.lib.PaperLib;
import lombok.RequiredArgsConstructor;
import org.bukkit.Bukkit;
import org.bukkit.command.ConsoleCommandSender;

12
Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
View File

@ -60,6 +60,7 @@ import org.slf4j.LoggerFactory;
import javax.annotation.Nonnull;
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Objects;
import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
@ -257,15 +258,13 @@ public class ChunkListener implements Listener {
final Integer currentIndex = TaskManager.index.get();
PlotSquaredTask task = TaskManager.runTaskRepeat(() -> {
if (!chunk.isLoaded()) {
TaskManager.tasks.get(currentIndex).cancel();
TaskManager.tasks.remove(currentIndex);
Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();
chunk.unload(true);
return;
}
BlockState[] tiles = chunk.getTileEntities();
if (tiles.length == 0) {
TaskManager.tasks.get(currentIndex).cancel();
TaskManager.tasks.remove(currentIndex);
Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();
chunk.unload(true);
return;
}
@ -273,8 +272,7 @@ public class ChunkListener implements Listener {
int i = 0;
while (System.currentTimeMillis() - start < 250) {
if (i >= tiles.length - Settings.Chunk_Processor.MAX_TILES) {
TaskManager.tasks.get(currentIndex).cancel();
TaskManager.tasks.remove(currentIndex);
Objects.requireNonNull(TaskManager.removeTask(currentIndex)).cancel();
chunk.unload(true);
return;
}
@ -282,7 +280,7 @@ public class ChunkListener implements Listener {
i++;
}
}, TaskTime.ticks(5L));
TaskManager.tasks.put(currentIndex, task);
TaskManager.addTask(task, currentIndex);
}
public boolean processChunk(Chunk chunk, boolean unload) {

6
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
View File

@ -842,7 +842,7 @@ import java.util.regex.Pattern;
Player player = event.getPlayer();
BukkitPlayer pp = BukkitUtil.getPlayer(player);
// Cancel teleport
if (TaskManager.TELEPORT_QUEUE.remove(pp.getName())) {
if (TaskManager.removeFromTeleportQueue(pp.getName())) {
MainUtil.sendMessage(pp, Captions.TELEPORT_FAILED);
}
// Set last location
@ -904,7 +904,7 @@ import java.util.regex.Pattern;
Player player = event.getPlayer();
BukkitPlayer pp = BukkitUtil.getPlayer(player);
// Cancel teleport
if (TaskManager.TELEPORT_QUEUE.remove(pp.getName())) {
if (TaskManager.removeFromTeleportQueue(pp.getName())) {
MainUtil.sendMessage(pp, Captions.TELEPORT_FAILED);
}
// Set last location
@ -2417,7 +2417,7 @@ import java.util.regex.Pattern;
}
@EventHandler(priority = EventPriority.MONITOR) public void onLeave(PlayerQuitEvent event) {
TaskManager.TELEPORT_QUEUE.remove(event.getPlayer().getName());
TaskManager.removeFromTeleportQueue(event.getPlayer().getName());
BukkitPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
pp.unregister();
this.logout(pp.getUUID());

4
Core/src/main/java/com/plotsquared/core/command/Trim.java
View File

@ -121,7 +121,7 @@ public class Trim extends SubCommand {
}
}
}).thenAccept(ignore ->
TaskManager.getPlatformImplementation().taskLater(result, TaskTime.ticks(1)));
TaskManager.getPlatformImplementation().taskLater(result, TaskTime.ticks(1L)));
return true;
}
@ -196,7 +196,7 @@ public class Trim extends SubCommand {
queue.regenChunk(value.getX(), value.getZ());
}
}).thenAccept(ignore -> TaskManager.getPlatformImplementation()
.taskLater(this, TaskTime.ticks(1)));
.taskLater(this, TaskTime.ticks(1L)));
}
};
} else {

4
Core/src/main/java/com/plotsquared/core/plot/Plot.java
View File

@ -2996,9 +2996,9 @@ public class Plot {
MainUtil
.sendMessage(player, Captions.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
final String name = player.getName();
TaskManager.TELEPORT_QUEUE.add(name);
TaskManager.addToTeleportQueue(name);
TaskManager.runTaskLater(() -> {
if (!TaskManager.TELEPORT_QUEUE.remove(name)) {
if (!TaskManager.removeFromTeleportQueue(name)) {
return;
}
if (player.isOnline()) {

2
Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
View File

@ -377,7 +377,7 @@ public class ExpireManager {
ExpireManager.this.running = 2;
runTask(expiredTask);
}
}, TaskTime.ticks(86400000));
}, TaskTime.ticks(86400000L));
} else {
TaskManager.runTaskLaterAsync(task, TaskTime.seconds(10L));
}

2
Core/src/main/java/com/plotsquared/core/util/RegionManager.java
View File

@ -101,7 +101,7 @@ public abstract class RegionManager {
.thenRun(() -> task.run(value));
}
}).thenAccept(ignore ->
TaskManager.getPlatformImplementation().taskLater(whenDone, TaskTime.ticks(1)));
TaskManager.getPlatformImplementation().taskLater(whenDone, TaskTime.ticks(1L)));
});
}

46
Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java
View File

@ -35,6 +35,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
@ -51,12 +53,52 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public abstract class TaskManager {
public static final HashSet<String> TELEPORT_QUEUE = new HashSet<>();
public static final HashMap<Integer, PlotSquaredTask> tasks = new HashMap<>();
private static final Set<String> teleportQueue = new HashSet<>();
private static final Map<Integer, PlotSquaredTask> tasks = new HashMap<>();
public static AtomicInteger index = new AtomicInteger(0);
@Getter @Setter private static TaskManager platformImplementation;
/**
* Add a string to the teleport queue
*
* @param string String to add
*/
public static void addToTeleportQueue(@Nonnull final String string) {
teleportQueue.add(string);
}
/**
* Remove a string from the teleport queue
*
* @param string String to remove
* return {@code true} if the value was stored in the map, or {@code false}
*/
public static boolean removeFromTeleportQueue(@Nonnull final String string) {
return teleportQueue.remove(string);
}
/**
* Add a task to the task map
*
* @param task Task
* @param id Task ID
*/
public static void addTask(@Nonnull final PlotSquaredTask task, final int id) {
tasks.put(id, task);
}
/**
* Remove a task from the task map and return the stored value
*
* @param id Task ID
* @return Task if stored, or {@code null}
*/
@Nullable public static PlotSquaredTask removeTask(final int id) {
return tasks.get(id);
}
/**
* Run a repeating synchronous task. If using a platform scheduler,
* this is guaranteed to run on the server thread