Skip to content

Ensure atomic main-thread transactions #42

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
RecoTG wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure atomic main-thread transactions #42

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
9 changes: 7 additions & 2 deletions src/main/java/com/yourorg/servershop/gui/SellMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;

import com.yourorg.servershop.logging.Transaction;

import java.time.Instant;
import java.util.*;

public final class SellMenu implements MenuView {
Expand Down Expand Up @@ -53,6 +56,7 @@ public void refresh(Player p) {

private void sellAll(Player p) {
double total = 0.0; int stacks = 0;
List<Transaction> txs = new ArrayList<>();
for (int i = 0; i < p.getInventory().getSize(); i++) {
ItemStack s = p.getInventory().getItem(i);
if (s == null) continue; var m = s.getType();
Expand All @@ -62,11 +66,12 @@ private void sellAll(Player p) {
double amount = unit * qty;
total += amount; stacks++;
p.getInventory().setItem(i, null);
plugin.logger().logAsync(new com.yourorg.servershop.logging.Transaction(java.time.Instant.now(), p.getName(), com.yourorg.servershop.logging.Transaction.Type.SELL, m, qty, amount));
// TODO: consider calling plugin.dynamic().adjustOnSell(m, qty) per TODO list
plugin.dynamic().adjustOnSell(m, qty);
txs.add(new Transaction(Instant.now(), p.getName(), Transaction.Type.SELL, m, qty, amount));
}
if (total > 0) plugin.economy().depositPlayer(p, total);
p.sendMessage(plugin.prefixed(plugin.getConfig().getString("messages.soldall").replace("%count%", String.valueOf(stacks)).replace("%total%", String.format("%.2f", total))));
txs.forEach(plugin.logger()::logAsync);
refresh(p);
}

Expand Down
26 changes: 26 additions & 0 deletions src/main/java/com/yourorg/servershop/shop/ShopService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,33 @@

import com.yourorg.servershop.ServerShopPlugin;
import com.yourorg.servershop.logging.Transaction;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

import java.time.Instant;
import java.util.Optional;
import java.util.concurrent.ExecutionException;

public final class ShopService {
private final ServerShopPlugin plugin;

public ShopService(ServerShopPlugin plugin) { this.plugin = plugin; }

public Optional<String> buy(Player p, Material mat, int qty) {
if (!Bukkit.isPrimaryThread()) {
try {
return Bukkit.getScheduler().callSyncMethod(plugin, () -> buySync(p, mat, qty)).get();
} catch (InterruptedException | ExecutionException e) {
Thread.currentThread().interrupt();
return Optional.of("Internal error");
}
}
return buySync(p, mat, qty);
}

private Optional<String> buySync(Player p, Material mat, int qty) {
var opt = plugin.catalog().get(mat);
if (opt.isEmpty() || !opt.get().canBuy()) return Optional.of(msg("not-for-sale").replace("%material%", mat.name()));
String cat = plugin.catalog().categoryOf(mat);
Expand All @@ -38,6 +52,18 @@ public Optional<String> buy(Player p, Material mat, int qty) {
}

public Optional<String> sell(Player p, Material mat, int qty) {
if (!Bukkit.isPrimaryThread()) {
try {
return Bukkit.getScheduler().callSyncMethod(plugin, () -> sellSync(p, mat, qty)).get();
} catch (InterruptedException | ExecutionException e) {
Thread.currentThread().interrupt();
return Optional.of("Internal error");
}
}
return sellSync(p, mat, qty);
}

private Optional<String> sellSync(Player p, Material mat, int qty) {
var opt = plugin.catalog().get(mat);
if (opt.isEmpty() || !opt.get().canSell()) return Optional.of(msg("not-sellable").replace("%material%", mat.name()));
String cat = plugin.catalog().categoryOf(mat);
Expand Down
Loading