Skip to content

fix bug #120

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

Merged
shixinzia merged 1 commit into from
Apr 20, 2026
Merged

fix bug #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion src/main/java/me/ddggdd135/slimeae/api/autocraft/AutoCraftingTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ public synchronized void suspend() {
}

if (SlimeAEPlugin.getCraftTaskPersistence() != null) {
SlimeAEPlugin.getCraftTaskPersistence().save(this);
SlimeAEPlugin.getCraftTaskPersistence().saveSuspended(this);
}

info.getAutoCraftingSessions().remove(this);
Expand Down Expand Up @@ -955,6 +955,8 @@ public void refreshGUI(int maxSize, boolean cancelButton) {
public void start() {
if (!SlimeAEPlugin.getNetworkData().AllNetworkData.contains(info)) return;

if (info.getAutoCraftingSessions().contains(this)) return;

AutoCraftingTaskStartingEvent e = new AutoCraftingTaskStartingEvent(this);
Bukkit.getPluginManager().callEvent(e);

Expand Down Expand Up @@ -1047,4 +1049,16 @@ public synchronized void dispose() {
Bukkit.getScheduler()
.runTask(SlimeAEPlugin.getInstance(), () -> menu.getInventory().close());
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof AutoCraftingTask other)) return false;
return taskId.equals(other.taskId);
}

@Override
public int hashCode() {
return taskId.hashCode();
}
}
77 changes: 70 additions & 7 deletions src/main/java/me/ddggdd135/slimeae/api/database/v3/CraftTaskPersistence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public void initSchema() {
+ "global_fail INT NOT NULL DEFAULT 0, "
+ "cancel_fail INT NOT NULL DEFAULT 0, "
+ "is_cancelling TINYINT NOT NULL DEFAULT 0, "
+ "is_suspended TINYINT NOT NULL DEFAULT 0, "
+ "created_at BIGINT NOT NULL, "
+ "suspended_at BIGINT NOT NULL"
+ ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4";
Expand All @@ -65,6 +66,7 @@ public void initSchema() {
+ "global_fail INTEGER NOT NULL DEFAULT 0, "
+ "cancel_fail INTEGER NOT NULL DEFAULT 0, "
+ "is_cancelling INTEGER NOT NULL DEFAULT 0, "
+ "is_suspended INTEGER NOT NULL DEFAULT 0, "
+ "created_at INTEGER NOT NULL, "
+ "suspended_at INTEGER NOT NULL)";
}
Expand All @@ -83,6 +85,17 @@ public void initSchema() {
"CREATE INDEX IF NOT EXISTS idx_craft_tasks_ctrl ON ae_v3_craft_tasks(controller_world, controller_x, controller_y, controller_z)";
conn.createStatement().execute(idx);
}

try {
String alter;
if (mysql) {
alter = "ALTER TABLE ae_v3_craft_tasks ADD COLUMN is_suspended TINYINT NOT NULL DEFAULT 0";
} else {
alter = "ALTER TABLE ae_v3_craft_tasks ADD COLUMN is_suspended INTEGER NOT NULL DEFAULT 0";
}
conn.createStatement().execute(alter);
} catch (SQLException ignored) {
}
} catch (SQLException e) {
logger.log(Level.SEVERE, "Failed to create ae_v3_craft_tasks table", e);
}
Expand All @@ -94,23 +107,63 @@ public void save(AutoCraftingTask task) {
upsert = "INSERT INTO ae_v3_craft_tasks "
+ "(task_id, controller_world, controller_x, controller_y, controller_z, "
+ "recipe_data, task_count, steps_data, deps_data, completed_idx, "
+ "storage_data, global_fail, cancel_fail, is_cancelling, created_at, suspended_at) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) "
+ "storage_data, global_fail, cancel_fail, is_cancelling, is_suspended, created_at, suspended_at) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?) "
+ "ON DUPLICATE KEY UPDATE "
+ "recipe_data=VALUES(recipe_data), task_count=VALUES(task_count), "
+ "steps_data=VALUES(steps_data), deps_data=VALUES(deps_data), "
+ "completed_idx=VALUES(completed_idx), storage_data=VALUES(storage_data), "
+ "global_fail=VALUES(global_fail), cancel_fail=VALUES(cancel_fail), "
+ "is_cancelling=VALUES(is_cancelling), suspended_at=VALUES(suspended_at)";
} else {
upsert = "INSERT OR REPLACE INTO ae_v3_craft_tasks "
upsert = "INSERT INTO ae_v3_craft_tasks "
+ "(task_id, controller_world, controller_x, controller_y, controller_z, "
+ "recipe_data, task_count, steps_data, deps_data, completed_idx, "
+ "storage_data, global_fail, cancel_fail, is_cancelling, created_at, suspended_at) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ "storage_data, global_fail, cancel_fail, is_cancelling, is_suspended, created_at, suspended_at) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?) "
+ "ON CONFLICT(task_id) DO UPDATE SET "
+ "recipe_data=excluded.recipe_data, task_count=excluded.task_count, "
+ "steps_data=excluded.steps_data, deps_data=excluded.deps_data, "
+ "completed_idx=excluded.completed_idx, storage_data=excluded.storage_data, "
+ "global_fail=excluded.global_fail, cancel_fail=excluded.cancel_fail, "
+ "is_cancelling=excluded.is_cancelling, suspended_at=excluded.suspended_at";
}
executeTaskSave(task, upsert);
}

public void saveSuspended(AutoCraftingTask task) {
String upsert;
if (mysql) {
upsert = "INSERT INTO ae_v3_craft_tasks "
+ "(task_id, controller_world, controller_x, controller_y, controller_z, "
+ "recipe_data, task_count, steps_data, deps_data, completed_idx, "
+ "storage_data, global_fail, cancel_fail, is_cancelling, is_suspended, created_at, suspended_at) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?) "
+ "ON DUPLICATE KEY UPDATE "
+ "recipe_data=VALUES(recipe_data), task_count=VALUES(task_count), "
+ "steps_data=VALUES(steps_data), deps_data=VALUES(deps_data), "
+ "completed_idx=VALUES(completed_idx), storage_data=VALUES(storage_data), "
+ "global_fail=VALUES(global_fail), cancel_fail=VALUES(cancel_fail), "
+ "is_cancelling=VALUES(is_cancelling), is_suspended=1, suspended_at=VALUES(suspended_at)";
} else {
upsert = "INSERT INTO ae_v3_craft_tasks "
+ "(task_id, controller_world, controller_x, controller_y, controller_z, "
+ "recipe_data, task_count, steps_data, deps_data, completed_idx, "
+ "storage_data, global_fail, cancel_fail, is_cancelling, is_suspended, created_at, suspended_at) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?) "
+ "ON CONFLICT(task_id) DO UPDATE SET "
+ "recipe_data=excluded.recipe_data, task_count=excluded.task_count, "
+ "steps_data=excluded.steps_data, deps_data=excluded.deps_data, "
+ "completed_idx=excluded.completed_idx, storage_data=excluded.storage_data, "
+ "global_fail=excluded.global_fail, cancel_fail=excluded.cancel_fail, "
+ "is_cancelling=excluded.is_cancelling, is_suspended=1, suspended_at=excluded.suspended_at";
}
executeTaskSave(task, upsert);
}

private void executeTaskSave(AutoCraftingTask task, String sql) {
try (Connection conn = connMgr.getWriteConnection();
PreparedStatement ps = conn.prepareStatement(upsert)) {
PreparedStatement ps = conn.prepareStatement(sql)) {
Location ctrl = task.getNetworkInfo().getController();
ps.setString(1, task.getTaskId().toString());
ps.setString(2, ctrl.getWorld().getName());
Expand Down Expand Up @@ -156,10 +209,15 @@ public int tryRestore(NetworkInfo info) {
String worldName = ctrl.getWorld().getName();
int restored = 0;

Set<UUID> activeTaskIds = new HashSet<>();
for (AutoCraftingTask t : info.getAutoCraftingSessions()) {
activeTaskIds.add(t.getTaskId());
}

List<TaskRecord> records = new ArrayList<>();
try (Connection conn = connMgr.getReadConnection();
PreparedStatement ps = conn.prepareStatement(
"SELECT * FROM ae_v3_craft_tasks WHERE controller_world = ? AND controller_x = ? AND controller_y = ? AND controller_z = ?")) {
"SELECT * FROM ae_v3_craft_tasks WHERE controller_world = ? AND controller_x = ? AND controller_y = ? AND controller_z = ? AND is_suspended = 1")) {
ps.setString(1, worldName);
ps.setInt(2, ctrl.getBlockX());
ps.setInt(3, ctrl.getBlockY());
Expand Down Expand Up @@ -187,6 +245,11 @@ public int tryRestore(NetworkInfo info) {
}

for (TaskRecord rec : records) {
if (activeTaskIds.contains(rec.taskId)) {
delete(rec.taskId);
continue;
}

try {
CraftingRecipe recipe = CraftTaskSerializer.deserializeRecipe(rec.recipeData);
if (recipe == null) {
Expand Down
Loading