From 5b709cc9a218b363a0a0ac35c945cebc32945f4d Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 6 Dec 2024 21:39:00 -0600 Subject: [PATCH] Fixing undelivered sealed or announcement transfers causing constant client delivery spam --- .../src/main/web/js/gemp-022/deckbuilderDeliveryService.js | 2 +- .../src/main/java/com/gempukku/lotro/db/DbTransferDAO.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckbuilderDeliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckbuilderDeliveryService.js index 5cf637cd9..1f6455bbb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckbuilderDeliveryService.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckbuilderDeliveryService.js @@ -2,7 +2,7 @@ var deckDeliveryDialogs = {}; var deckDeliveryGroups = {}; function deckbuilderDeliveryService(xml) { - console.log("Delivered a package:"); + console.log("Delivered a package for deckbuilder:"); console.log(xml); var root = xml.documentElement; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java index 46784b25b..53899b1f3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java @@ -106,8 +106,8 @@ public class DbTransferDAO implements TransferDAO { FROM transfer WHERE player = :playerName AND notify = TRUE - AND date_recorded < NOW(); - """; + AND date_recorded < NOW() + """ + " AND reason NOT IN ('" + ANNOUNCEMENT + "', '" + OPENED_PACK + "') ";; Integer result = conn.createQuery(sql) .addParameter("playerName", player.getName()) .executeScalar(Integer.class);