From 2d11ecf2d30669b9ededbd552897a1711eab8ae0 Mon Sep 17 00:00:00 2001 From: M_Viper Date: Sun, 15 Nov 2026 19:52:28 +0000 Subject: [PATCH] Upload via GUI (4 Dateien) --- .../de/mviper/spigot/IngameShopSpigot.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/IngameShopSpigot/src/main/java/de/mviper/spigot/IngameShopSpigot.java b/IngameShopSpigot/src/main/java/de/mviper/spigot/IngameShopSpigot.java index beb6e6f..8f85fe7 100644 --- a/IngameShopSpigot/src/main/java/de/mviper/spigot/IngameShopSpigot.java +++ b/IngameShopSpigot/src/main/java/de/mviper/spigot/IngameShopSpigot.java @@ -344,7 +344,8 @@ public class IngameShopSpigot extends JavaPlugin implements Listener { } try { HttpURLConnection conn = - openAuthConnection(endpointUrl + "?player=" + p.getName(), "GET"); + openAuthConnection(endpointUrl + "?player=" + p.getName() + + "&server=" + targetServer, "GET"); int responseCode = conn.getResponseCode(); if (responseCode == 200) { String body = readResponse(conn); @@ -386,19 +387,15 @@ public class IngameShopSpigot extends JavaPlugin implements Listener { final int deliveryId = id; final String deliveryTitle = itemTitle; final String deliveryJson = jsonResponse; - synchronized (activeOrderIds) { - if (activeOrderIds.containsKey(p.getUniqueId())) { - if (debug) getLogger().info( - "Abo-Delivery #" + id + " für " + p.getName() - + " verschoben (aktive Order)."); - return; - } - OrderData delivData = new OrderData( - deliveryId, "item_abo_delivery", deliveryTitle, - 0.0, 1, deliveryJson, ""); - orderCache.put(deliveryId, delivData); - activeOrderIds.put(p.getUniqueId(), deliveryId); - } + // WP hat die Order beim Abholen bereits auf "claimed" gesetzt – + // sie darf hier nicht mehr verworfen werden, sonst geht sie verloren. + // Abo-Lieferungen brauchen kein Confirm-GUI und blockieren daher + // auch keine aktive Order. + orderCache.put(deliveryId, new OrderData( + deliveryId, "item_abo_delivery", deliveryTitle, + 0.0, 1, deliveryJson, "")); + getLogger().info("[AboDelivery] Order #" + deliveryId + + " für " + p.getName() + " abgeholt: " + deliveryTitle); // execute_order sofort markieren, dann Items geben new BukkitRunnable() { @Override public void run() { @@ -414,7 +411,6 @@ public class IngameShopSpigot extends JavaPlugin implements Listener { Bukkit.getScheduler().runTask(IngameShopSpigot.this, () -> { OrderData dd = orderCache.get(deliveryId); if (dd != null) { - activeOrderIds.remove(p.getUniqueId()); deliverAboItems(p, deliveryId, deliveryTitle, deliveryJson); } }); @@ -2994,7 +2990,10 @@ public class IngameShopSpigot extends JavaPlugin implements Listener { writeJson(conn, "{\"player\":\"" + player.getName() + "\",\"server\":\"" + targetServer + "\"}"); 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 = ""; try { body = readResponse(conn); } catch (Exception ignored) {} JsonObject resp = JsonParser.parseString(body).getAsJsonObject();