Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@ else if (object instanceof String) {
}
}

@Override
public void onDisable() {
repairManager.shutdown();
}

@NotNull
public WorldEditPlugin getWorldEditPlugin() {
return worldEditPlugin;
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/net/countercraft/movecraft/repair/RepairManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,33 @@ public void run() {
}
}

public void shutdown() {
long start = System.currentTimeMillis();
MovecraftRepair.getInstance().getLogger().info(() -> String.format("Completing %d repairs", repairs.size()));

while (!repairs.isEmpty()) {
Repair repair = repairs.poll();
repair.run();

if (repair.isDone()) {
end(repair);
}
else {
repairs.add(repair);
}

if (System.currentTimeMillis() - start > 5000) {
MovecraftRepair.getInstance().getLogger().info(() -> String.format("Repair time overrun, %d skipped:", repairs.size()));
for (Repair skipped : repairs) {
MovecraftRepair.getInstance().getLogger().info(() -> String.format("- %s's repair %s with the cost of %.2f", skipped.getPlayerUUID(), skipped.getName(), skipped.getCost()));
}
return;
}
}

MovecraftRepair.getInstance().getLogger().info(() -> String.format("Repairs completed in %d ms", System.currentTimeMillis() - start));
}

public Set<Repair> get() {
return new HashSet<>(repairs);
}
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/net/countercraft/movecraft/repair/types/Repair.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,9 @@ public boolean run(long time) {
int placedBlocks = 0;

while (elapsedTicks > Config.RepairTicksPerBlock && placedBlocks <= Config.RepairMaxBlocksPerTick) {
RepairTask task = queue.poll();
if (task == null)
if (!run())
break;

task.execute();
elapsedTicks -= Config.RepairTicksPerBlock;
placedBlocks++;
}
Expand All @@ -73,4 +71,13 @@ public boolean run(long time) {

return false;
}

public boolean run() {
RepairTask task = queue.poll();
if (task == null)
return false;

task.execute();
return true;
}
}
Loading