Skip to content

folia: rollback #global #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
+169 −87
Open

folia: rollback #global #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1d3b20e
replace sync chunk loading with async operations
leir4iks Oct 21, 2025
18e0e2b
javadoc
leir4iks Oct 21, 2025
1f3fc7e
more fixes
leir4iks Oct 21, 2025
1e41943
improve folia support
leir4iks Oct 29, 2025
c0d6c26
fix folia container rollback
leir4iks Oct 29, 2025
3049759
fix folia container rollback
leir4iks Oct 29, 2025
83efeb9
Revert "fix folia container rollback"
leir4iks Nov 2, 2025
23b2816
Revert "fix folia container rollback"
leir4iks Nov 2, 2025
0c734d7
Revert "improve folia support"
leir4iks Nov 2, 2025
038dcf9
sorry
leir4iks Nov 3, 2025
646305b
back + rewrite rewrite
leir4iks Nov 6, 2025
869c943
123
leir4iks Nov 6, 2025
a2b59e3
456
leir4iks Nov 6, 2025
717d516
456
leir4iks Nov 6, 2025
e50afe9
789
leir4iks Nov 6, 2025
29933c9
789
leir4iks Nov 6, 2025
3593f50
Update RollbackProcessor.java
leir4iks Nov 6, 2025
c23280c
rewrite
leir4iks Nov 9, 2025
6cd2964
Update CoreProtectAPI.java
leir4iks Nov 9, 2025
c7088ae
Update Rollback.java
leir4iks Nov 9, 2025
854b3cb
Update RollbackEntityHandler.java
leir4iks Nov 9, 2025
5f788e9
Update RollbackProcessor.java
leir4iks Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions src/main/java/net/coreprotect/command/TeleportCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,98 +19,110 @@

public class TeleportCommand {

protected static void runCommand(CommandSender player, boolean permission, String[] args) {
int resultc = args.length;

if (!permission) {
Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.NO_PERMISSION));
return;
}

if (!(player instanceof Player)) {
Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.TELEPORT_PLAYERS));
return;
}

if (ConfigHandler.teleportThrottle.get(player.getName()) != null) {
Object[] lookupThrottle = ConfigHandler.teleportThrottle.get(player.getName());
if ((boolean) lookupThrottle[0] || ((System.currentTimeMillis() - (long) lookupThrottle[1])) < 500) {
Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.COMMAND_THROTTLED));
return;
}
}

if (resultc < 3) {
Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co teleport <world> <x> <y> <z>"));
return;
}

String worldName = args[1];
int wid = WorldUtils.matchWorld(worldName);
if (wid == -1 && resultc >= 5) {
Chat.sendMessage(player, new ChatMessage(Phrase.build(Phrase.WORLD_NOT_FOUND, worldName)).build());
return;
}

Location location = ((Player) player).getLocation().clone();
World world = location.getWorld();
if (wid > -1) {
world = Bukkit.getServer().getWorld(WorldUtils.getWorldName(wid));
if (world == null) {
return;
}
}

String x = null;
String y = null;
String z = null;

for (int i = 1; i < args.length; i++) {
if (i == 1 && wid > -1) {
continue;
}

if (x == null) {
x = args[i].replaceAll("[^0-9.\\-]", "");
}
else if (z == null) {
z = args[i].replaceAll("[^0-9.\\-]", "");
}
else if (y == null) {
y = z;
z = args[i].replaceAll("[^0-9.\\-]", "");
}
}

if (y == null) {
if (location.getBlockY() > 63) {
location.setY(63);
}
y = Double.toString(location.getY());
}

String xValidate = x.replaceAll("[^.\\-]", "");
String yValidate = y.replaceAll("[^.\\-]", "");
String zValidate = z.replaceAll("[^.\\-]", "");

if ((x.length() == 0 || x.length() >= 12 || x.equals(xValidate)) || (y.length() == 0 || y.length() >= 12 || y.equals(yValidate)) || (z.length() == 0 || z.length() >= 12 || z.equals(zValidate))) {
Chat.sendMessage(player, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.MISSING_PARAMETERS, "/co teleport <world> <x> <y> <z>"));
return;
}

location.setWorld(world);
location.setX(Double.parseDouble(x));
location.setY(Double.parseDouble(y));
location.setZ(Double.parseDouble(z));

int chunkX = location.getBlockX() >> 4;
int chunkZ = location.getBlockZ() >> 4;
Scheduler.runTask(CoreProtect.getInstance(), () -> {
if (!location.getWorld().isChunkLoaded(chunkX, chunkZ)) {
location.getWorld().getChunkAt(location);
}

// Teleport the player to a safe location
Teleport.performSafeTeleport(((Player) player), location, true);
}, location);
if (ConfigHandler.isFolia) {
CoreProtect.getInstance().getServer().getRegionScheduler().run(CoreProtect.getInstance(), location, task -> {
location.getWorld().getChunkAtAsync(location).thenAccept(chunk -> {
Teleport.performSafeTeleport(((Player) player), location, true);
});
});
}
else {
int chunkX = location.getBlockX() >> 4;
int chunkZ = location.getBlockZ() >> 4;
Scheduler.runTask(CoreProtect.getInstance(), () -> {
if (!location.getWorld().isChunkLoaded(chunkX, chunkZ)) {
location.getWorld().getChunkAt(location);
}

// Teleport the player to a safe location
Teleport.performSafeTeleport(((Player) player), location, true);
}, location);
}

Check notice on line 125 in src/main/java/net/coreprotect/command/TeleportCommand.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/command/TeleportCommand.java#L22-L125 

Complex Method
ConfigHandler.teleportThrottle.put(player.getName(), new Object[] { false, System.currentTimeMillis() });
}
}
220 changes: 145 additions & 75 deletions src/main/java/net/coreprotect/database/rollback/Rollback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import org.bukkit.Bukkit;
import org.bukkit.Location;
Expand Down Expand Up @@ -38,271 +41,338 @@

public class Rollback extends RollbackUtil {

public static List<String[]> performRollbackRestore(Statement statement, CommandSender user, List<String> checkUuids, List<String> checkUsers, String timeString, List<Object> restrictList, Map<Object, Boolean> excludeList, List<String> excludeUserList, List<Integer> actionList, Location location, Integer[] radius, long startTime, long endTime, boolean restrictWorld, boolean lookup, boolean verbose, final int rollbackType, final int preview) {
List<String[]> list = new ArrayList<>();

try {
long timeStart = System.currentTimeMillis();
List<Object[]> lookupList = new ArrayList<>();

if (!actionList.contains(4) && !actionList.contains(5) && !checkUsers.contains("#container")) {
lookupList = Lookup.performLookupRaw(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup);
}

if (lookupList == null) {
return null;
}

boolean ROLLBACK_ITEMS = false;
List<Object> itemRestrictList = new ArrayList<>(restrictList);
Map<Object, Boolean> itemExcludeList = new HashMap<>(excludeList);

if (actionList.contains(1)) {
for (Object target : restrictList) {
if (target instanceof Material) {
if (!excludeList.containsKey(target)) {
if (BlockGroup.CONTAINERS.contains(target)) {
ROLLBACK_ITEMS = true;
itemRestrictList.clear();
itemExcludeList.clear();
break;
}
}
}
}
}

List<Object[]> itemList = new ArrayList<>();
if (Config.getGlobal().ROLLBACK_ITEMS && !checkUsers.contains("#container") && (actionList.size() == 0 || actionList.contains(4) || ROLLBACK_ITEMS) && preview == 0) {
List<Integer> itemActionList = new ArrayList<>(actionList);

if (!itemActionList.contains(4)) {
itemActionList.add(4);
}

itemExcludeList.entrySet().removeIf(entry -> Boolean.TRUE.equals(entry.getValue()));
itemList = Lookup.performLookupRaw(statement, user, checkUuids, checkUsers, itemRestrictList, itemExcludeList, excludeUserList, itemActionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup);
}

LinkedHashSet<Integer> worldList = new LinkedHashSet<>();
TreeMap<Long, Integer> chunkList = new TreeMap<>();
HashMap<Integer, HashMap<Long, ArrayList<Object[]>>> dataList = new HashMap<>();
HashMap<Integer, HashMap<Long, ArrayList<Object[]>>> itemDataList = new HashMap<>();
boolean inventoryRollback = actionList.contains(11);

int worldId = -1;
int worldMin = 0;
int worldMax = 2032;

int listC = 0;
while (listC < 2) {
List<Object[]> scanList = lookupList;

if (listC == 1) {
scanList = itemList;
}

for (Object[] result : scanList) {
int userId = (Integer) result[2];
int rowX = (Integer) result[3];
int rowY = (Integer) result[4];
int rowZ = (Integer) result[5];
int rowWorldId = (Integer) result[10];
int chunkX = rowX >> 4;
int chunkZ = rowZ >> 4;
long chunkKey = inventoryRollback ? 0 : (chunkX & 0xffffffffL | (chunkZ & 0xffffffffL) << 32);

if (rowWorldId != worldId) {
String world = WorldUtils.getWorldName(rowWorldId);
World bukkitWorld = Bukkit.getServer().getWorld(world);
if (bukkitWorld != null) {
worldMin = BukkitAdapter.ADAPTER.getMinHeight(bukkitWorld);
worldMax = bukkitWorld.getMaxHeight();
}
}

if (chunkList.get(chunkKey) == null) {
int distance = 0;
if (location != null) {
distance = (int) Math.sqrt(Math.pow((Integer) result[3] - location.getBlockX(), 2) + Math.pow((Integer) result[5] - location.getBlockZ(), 2));
}

chunkList.put(chunkKey, distance);
}

if (ConfigHandler.playerIdCacheReversed.get(userId) == null) {
UserStatement.loadName(statement.getConnection(), userId);
}

HashMap<Integer, HashMap<Long, ArrayList<Object[]>>> modifyList = dataList;
if (listC == 1) {
modifyList = itemDataList;
}

if (modifyList.get(rowWorldId) == null) {
dataList.put(rowWorldId, new HashMap<>());
itemDataList.put(rowWorldId, new HashMap<>());
worldList.add(rowWorldId);
}

if (modifyList.get(rowWorldId).get(chunkKey) == null) {
dataList.get(rowWorldId).put(chunkKey, new ArrayList<>());
itemDataList.get(rowWorldId).put(chunkKey, new ArrayList<>());
}

modifyList.get(rowWorldId).get(chunkKey).add(result);
}

listC++;
}

if (rollbackType == 1) { // Restore
Iterator<Map.Entry<Integer, HashMap<Long, ArrayList<Object[]>>>> dlIterator = dataList.entrySet().iterator();
while (dlIterator.hasNext()) {
for (ArrayList<Object[]> map : dlIterator.next().getValue().values()) {
Collections.reverse(map);
}
}

dlIterator = itemDataList.entrySet().iterator();
while (dlIterator.hasNext()) {
for (ArrayList<Object[]> map : dlIterator.next().getValue().values()) {
Collections.reverse(map);
}
}
}

Integer chunkCount = 0;
String userString = "#server";
if (user != null) {
userString = user.getName();
if (verbose && preview == 0 && !actionList.contains(11)) {
Integer chunks = chunkList.size();
Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_FOUND, chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND)));
}
}

// Perform update transaction(s) in consumer
if (preview == 0) {
if (actionList.contains(11)) {
List<Object[]> blockList = new ArrayList<>();
List<Object[]> inventoryList = new ArrayList<>();
List<Object[]> containerList = new ArrayList<>();
for (Object[] data : itemList) {
int table = (Integer) data[14];
if (table == 2) { // item
inventoryList.add(data);
}
else if (table == 1) { // container
containerList.add(data);
}
else { // block
blockList.add(data);
}
}
Queue.queueRollbackUpdate(userString, location, inventoryList, Process.INVENTORY_ROLLBACK_UPDATE, rollbackType);
Queue.queueRollbackUpdate(userString, location, containerList, Process.INVENTORY_CONTAINER_ROLLBACK_UPDATE, rollbackType);
Queue.queueRollbackUpdate(userString, location, blockList, Process.BLOCK_INVENTORY_ROLLBACK_UPDATE, rollbackType);
}
else {
Queue.queueRollbackUpdate(userString, location, lookupList, Process.ROLLBACK_UPDATE, rollbackType);
Queue.queueRollbackUpdate(userString, location, itemList, Process.CONTAINER_ROLLBACK_UPDATE, rollbackType);
}
}

ConfigHandler.rollbackHash.put(userString, new int[] { 0, 0, 0, 0, 0 });

final String finalUserString = userString;
for (Entry<Long, Integer> entry : DatabaseUtils.entriesSortedByValues(chunkList)) {
chunkCount++;

int itemCount = 0;
int blockCount = 0;
int entityCount = 0;
int scannedWorldData = 0;
int[] rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
itemCount = rollbackHashData[0];
blockCount = rollbackHashData[1];
entityCount = rollbackHashData[2];
scannedWorldData = rollbackHashData[4];

long chunkKey = entry.getKey();
final int finalChunkX = (int) chunkKey;
final int finalChunkZ = (int) (chunkKey >> 32);
final CommandSender finalUser = user;

HashMap<Integer, World> worldMap = new HashMap<>();
for (int rollbackWorldId : worldList) {
String rollbackWorld = WorldUtils.getWorldName(rollbackWorldId);
if (rollbackWorld.length() == 0) {
continue;
}

World bukkitRollbackWorld = Bukkit.getServer().getWorld(rollbackWorld);
if (bukkitRollbackWorld == null) {
continue;
if (ConfigHandler.isFolia) {
List<CompletableFuture<Void>> chunkTasks = new ArrayList<>();

for (Entry<Long, Integer> entry : DatabaseUtils.entriesSortedByValues(chunkList)) {
chunkCount++;
long chunkKey = entry.getKey();
final int finalChunkX = (int) chunkKey;
final int finalChunkZ = (int) (chunkKey >> 32);

HashMap<Integer, World> worldMap = new HashMap<>();
for (int rollbackWorldId : worldList) {
String rollbackWorld = WorldUtils.getWorldName(rollbackWorldId);
if (rollbackWorld.length() == 0) {
continue;
}

World bukkitRollbackWorld = Bukkit.getServer().getWorld(rollbackWorld);
if (bukkitRollbackWorld == null) {
continue;
}

worldMap.put(rollbackWorldId, bukkitRollbackWorld);
}

worldMap.put(rollbackWorldId, bukkitRollbackWorld);
for (Entry<Integer, World> rollbackWorlds : worldMap.entrySet()) {
Integer rollbackWorldId = rollbackWorlds.getKey();
World bukkitRollbackWorld = rollbackWorlds.getValue();
Location chunkLocation = new Location(bukkitRollbackWorld, (finalChunkX << 4), 0, (finalChunkZ << 4));
final HashMap<Long, ArrayList<Object[]>> finalBlockList = dataList.get(rollbackWorldId);
final HashMap<Long, ArrayList<Object[]>> finalItemList = itemDataList.get(rollbackWorldId);

CompletableFuture<Void> chunkTask = new CompletableFuture<>();
chunkTasks.add(chunkTask);

Scheduler.scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> {
try {
ArrayList<Object[]> blockData = finalBlockList != null ? finalBlockList.getOrDefault(chunkKey, new ArrayList<>()) : new ArrayList<>();
ArrayList<Object[]> itemData = finalItemList != null ? finalItemList.getOrDefault(chunkKey, new ArrayList<>()) : new ArrayList<>();

if (!bukkitRollbackWorld.isChunkLoaded(finalChunkX, finalChunkZ)) {
bukkitRollbackWorld.getChunkAtAsync(finalChunkX, finalChunkZ).thenAccept(chunk -> {
RollbackProcessor.processChunk(finalChunkX, finalChunkZ, chunkKey, blockData, itemData, rollbackType, preview, finalUserString, user instanceof Player ? (Player) user : null, bukkitRollbackWorld, inventoryRollback);
chunkTask.complete(null);
}).exceptionally(ex -> {
chunkTask.complete(null);
return null;
});
} else {
RollbackProcessor.processChunk(finalChunkX, finalChunkZ, chunkKey, blockData, itemData, rollbackType, preview, finalUserString, user instanceof Player ? (Player) user : null, bukkitRollbackWorld, inventoryRollback);
chunkTask.complete(null);
}
} catch (Exception e) {
chunkTask.complete(null);
}
}, chunkLocation, 0);
}
}

ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 0, scannedWorldData });
for (Entry<Integer, World> rollbackWorlds : worldMap.entrySet()) {
Integer rollbackWorldId = rollbackWorlds.getKey();
World bukkitRollbackWorld = rollbackWorlds.getValue();
Location chunkLocation = new Location(bukkitRollbackWorld, (finalChunkX << 4), 0, (finalChunkZ << 4));
final HashMap<Long, ArrayList<Object[]>> finalBlockList = dataList.get(rollbackWorldId);
final HashMap<Long, ArrayList<Object[]>> finalItemList = itemDataList.get(rollbackWorldId);

Scheduler.scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> {
// Process this chunk using our new RollbackProcessor class
ArrayList<Object[]> blockData = finalBlockList != null ? finalBlockList.getOrDefault(chunkKey, new ArrayList<>()) : new ArrayList<>();
ArrayList<Object[]> itemData = finalItemList != null ? finalItemList.getOrDefault(chunkKey, new ArrayList<>()) : new ArrayList<>();
RollbackProcessor.processChunk(finalChunkX, finalChunkZ, chunkKey, blockData, itemData, rollbackType, preview, finalUserString, finalUser instanceof Player ? (Player) finalUser : null, bukkitRollbackWorld, inventoryRollback);
}, chunkLocation, 0);
CompletableFuture<Void> allTasks = CompletableFuture.allOf(chunkTasks.toArray(new CompletableFuture[0]));

try {
allTasks.get(300, TimeUnit.SECONDS);

Check warning on line 281 in src/main/java/net/coreprotect/database/rollback/Rollback.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/database/rollback/Rollback.java#L281 

Empty catch block. (com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck)
} catch (TimeoutException e) {

Check warning on line 282 in src/main/java/net/coreprotect/database/rollback/Rollback.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/database/rollback/Rollback.java#L282 

Empty catch block. (com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck)
} catch (Exception e) {
}
} else {
for (Entry<Long, Integer> entry : DatabaseUtils.entriesSortedByValues(chunkList)) {
chunkCount++;

int itemCount = 0;
int blockCount = 0;
int entityCount = 0;
int scannedWorldData = 0;
int[] rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
itemCount = rollbackHashData[0];
blockCount = rollbackHashData[1];
entityCount = rollbackHashData[2];
scannedWorldData = rollbackHashData[4];

long chunkKey = entry.getKey();
final int finalChunkX = (int) chunkKey;
final int finalChunkZ = (int) (chunkKey >> 32);
final CommandSender finalUser = user;

HashMap<Integer, World> worldMap = new HashMap<>();
for (int rollbackWorldId : worldList) {
String rollbackWorld = WorldUtils.getWorldName(rollbackWorldId);
if (rollbackWorld.length() == 0) {
continue;
}

rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
int next = rollbackHashData[3];
int scannedWorlds = rollbackHashData[4];
int sleepTime = 0;
int abort = 0;

while (next == 0 || scannedWorlds < worldMap.size()) {
if (preview == 1) {
// Not actually changing blocks, so less intensive.
sleepTime = sleepTime + 1;
Thread.sleep(1);
World bukkitRollbackWorld = Bukkit.getServer().getWorld(rollbackWorld);
if (bukkitRollbackWorld == null) {
continue;
}

worldMap.put(rollbackWorldId, bukkitRollbackWorld);
}
else {
sleepTime = sleepTime + 5;
Thread.sleep(5);

ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 0, scannedWorldData });
for (Entry<Integer, World> rollbackWorlds : worldMap.entrySet()) {
Integer rollbackWorldId = rollbackWorlds.getKey();
World bukkitRollbackWorld = rollbackWorlds.getValue();
Location chunkLocation = new Location(bukkitRollbackWorld, (finalChunkX << 4), 0, (finalChunkZ << 4));
final HashMap<Long, ArrayList<Object[]>> finalBlockList = dataList.get(rollbackWorldId);
final HashMap<Long, ArrayList<Object[]>> finalItemList = itemDataList.get(rollbackWorldId);

Scheduler.scheduleSyncDelayedTask(CoreProtect.getInstance(), () -> {
// Process this chunk using our new RollbackProcessor class
ArrayList<Object[]> blockData = finalBlockList != null ? finalBlockList.getOrDefault(chunkKey, new ArrayList<>()) : new ArrayList<>();
ArrayList<Object[]> itemData = finalItemList != null ? finalItemList.getOrDefault(chunkKey, new ArrayList<>()) : new ArrayList<>();
RollbackProcessor.processChunk(finalChunkX, finalChunkZ, chunkKey, blockData, itemData, rollbackType, preview, finalUserString, finalUser instanceof Player ? (Player) finalUser : null, bukkitRollbackWorld, inventoryRollback);
}, chunkLocation, 0);
}

rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
next = rollbackHashData[3];
scannedWorlds = rollbackHashData[4];
int next = rollbackHashData[3];
int scannedWorlds = rollbackHashData[4];
int sleepTime = 0;
int abort = 0;

while (next == 0 || scannedWorlds < worldMap.size()) {
if (preview == 1) {
sleepTime = sleepTime + 1;
Thread.sleep(1);
}
else {
sleepTime = sleepTime + 5;
Thread.sleep(5);
}

if (sleepTime > 300000) {
abort = 1;
break;
}
}
rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
next = rollbackHashData[3];
scannedWorlds = rollbackHashData[4];

if (abort == 1 || next == 2) {
Chat.console(Phrase.build(Phrase.ROLLBACK_ABORTED));
break;
}
if (sleepTime > 300000) {
abort = 1;
break;
}
}

rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
itemCount = rollbackHashData[0];
blockCount = rollbackHashData[1];
entityCount = rollbackHashData[2];
ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 0, 0 });
if (abort == 1 || next == 2) {
Chat.console(Phrase.build(Phrase.ROLLBACK_ABORTED));
break;
}

if (verbose && user != null && preview == 0 && !actionList.contains(11)) {
Integer chunks = chunkList.size();
Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_MODIFIED, chunkCount.toString(), chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND)));
rollbackHashData = ConfigHandler.rollbackHash.get(finalUserString);
itemCount = rollbackHashData[0];
blockCount = rollbackHashData[1];
entityCount = rollbackHashData[2];
ConfigHandler.rollbackHash.put(finalUserString, new int[] { itemCount, blockCount, entityCount, 0, 0 });

if (verbose && user != null && preview == 0 && !actionList.contains(11)) {
Integer chunks = chunkList.size();
Chat.sendMessage(user, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_CHUNKS_MODIFIED, chunkCount.toString(), chunks.toString(), (chunks == 1 ? Selector.FIRST : Selector.SECOND)));
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/coreprotect/database/rollback/RollbackProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ else if (rowAction == 3) { // entity kill
}

Block block = bukkitWorld.getBlockAt(rowX, rowY, rowZ);
if (!bukkitWorld.isChunkLoaded(block.getChunk())) {
if (!ConfigHandler.isFolia && !bukkitWorld.isChunkLoaded(block.getChunk())) {
bukkitWorld.getChunkAt(block.getLocation());
}

Expand Down Expand Up @@ -346,7 +346,7 @@ else if (rowAction == ItemLogger.ITEM_REMOVE_ENDER || rowAction == ItemLogger.IT
continue;
}
Block block = bukkitWorld.getBlockAt(rowX, rowY, rowZ);
if (!bukkitWorld.isChunkLoaded(block.getChunk())) {
if (!ConfigHandler.isFolia && !bukkitWorld.isChunkLoaded(block.getChunk())) {
bukkitWorld.getChunkAt(block.getLocation());
}

Expand Down
Loading