Upload via GUI (4 Dateien)

This commit is contained in:
2026-11-15 19:52:28 +00:00
parent 37e62cf79b
commit 2d11ecf2d3
@@ -344,7 +344,8 @@ public class IngameShopSpigot extends JavaPlugin implements Listener {
} }
try { try {
HttpURLConnection conn = HttpURLConnection conn =
openAuthConnection(endpointUrl + "?player=" + p.getName(), "GET"); openAuthConnection(endpointUrl + "?player=" + p.getName()
+ "&server=" + targetServer, "GET");
int responseCode = conn.getResponseCode(); int responseCode = conn.getResponseCode();
if (responseCode == 200) { if (responseCode == 200) {
String body = readResponse(conn); String body = readResponse(conn);
@@ -386,19 +387,15 @@ public class IngameShopSpigot extends JavaPlugin implements Listener {
final int deliveryId = id; final int deliveryId = id;
final String deliveryTitle = itemTitle; final String deliveryTitle = itemTitle;
final String deliveryJson = jsonResponse; final String deliveryJson = jsonResponse;
synchronized (activeOrderIds) { // WP hat die Order beim Abholen bereits auf "claimed" gesetzt –
if (activeOrderIds.containsKey(p.getUniqueId())) { // sie darf hier nicht mehr verworfen werden, sonst geht sie verloren.
if (debug) getLogger().info( // Abo-Lieferungen brauchen kein Confirm-GUI und blockieren daher
"Abo-Delivery #" + id + " für " + p.getName() // auch keine aktive Order.
+ " verschoben (aktive Order)."); orderCache.put(deliveryId, new OrderData(
return; deliveryId, "item_abo_delivery", deliveryTitle,
} 0.0, 1, deliveryJson, ""));
OrderData delivData = new OrderData( getLogger().info("[AboDelivery] Order #" + deliveryId
deliveryId, "item_abo_delivery", deliveryTitle, + " für " + p.getName() + " abgeholt: " + deliveryTitle);
0.0, 1, deliveryJson, "");
orderCache.put(deliveryId, delivData);
activeOrderIds.put(p.getUniqueId(), deliveryId);
}
// execute_order sofort markieren, dann Items geben // execute_order sofort markieren, dann Items geben
new BukkitRunnable() { new BukkitRunnable() {
@Override public void run() { @Override public void run() {
@@ -414,7 +411,6 @@ public class IngameShopSpigot extends JavaPlugin implements Listener {
Bukkit.getScheduler().runTask(IngameShopSpigot.this, () -> { Bukkit.getScheduler().runTask(IngameShopSpigot.this, () -> {
OrderData dd = orderCache.get(deliveryId); OrderData dd = orderCache.get(deliveryId);
if (dd != null) { if (dd != null) {
activeOrderIds.remove(p.getUniqueId());
deliverAboItems(p, deliveryId, deliveryTitle, deliveryJson); deliverAboItems(p, deliveryId, deliveryTitle, deliveryJson);
} }
}); });
@@ -2994,7 +2990,10 @@ public class IngameShopSpigot extends JavaPlugin implements Listener {
writeJson(conn, "{\"player\":\"" + player.getName() writeJson(conn, "{\"player\":\"" + player.getName()
+ "\",\"server\":\"" + targetServer + "\"}"); + "\",\"server\":\"" + targetServer + "\"}");
int code = conn.getResponseCode(); int code = conn.getResponseCode();
if (code == 200 && debug) { if (code != 200) {
getLogger().warning("[ItemAbo] trigger_abo_delivery für "
+ player.getName() + " → HTTP " + code);
} else if (debug) {
String body = ""; String body = "";
try { body = readResponse(conn); } catch (Exception ignored) {} try { body = readResponse(conn); } catch (Exception ignored) {}
JsonObject resp = JsonParser.parseString(body).getAsJsonObject(); JsonObject resp = JsonParser.parseString(body).getAsJsonObject();