From 083c5f7b3fc6e902f3d94b378a8c342f3b44a5ac Mon Sep 17 00:00:00 2001 From: xdnw Date: Mon, 24 Jul 2023 06:47:53 +0100 Subject: [PATCH] update aa listener --- .../link/locutus/discord/util/offshore/OffshoreInstance.java | 2 +- .../java/link/locutus/discord/util/update/AllianceListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/link/locutus/discord/util/offshore/OffshoreInstance.java b/src/main/java/link/locutus/discord/util/offshore/OffshoreInstance.java index 4fca49d0..7763e590 100644 --- a/src/main/java/link/locutus/discord/util/offshore/OffshoreInstance.java +++ b/src/main/java/link/locutus/discord/util/offshore/OffshoreInstance.java @@ -832,7 +832,7 @@ public Map.Entry transferFromNationAccountWithRoleChecks senderDB.subtractBalance(timestamp, nationAccount, bankerNation.getNation_id(), note, amount); } - if (nationAccount != null && !depositType.isIgnored() && (banker == null || !Roles.ECON.has(banker, guildDBCached.getGuild()))) { + if (nationAccount != null && !depositType.isIgnored() && (banker == null || !Roles.ECON.has(banker, getGuildDB().getGuild()))) { double[] myNewDeposits = nationAccount.getNetDeposits(senderDB, !ignoreGrants, -1L); // ensure myDeposits and myNewDeposits difference is amount double[] diff = ResourceType.getBuffer(); diff --git a/src/main/java/link/locutus/discord/util/update/AllianceListener.java b/src/main/java/link/locutus/discord/util/update/AllianceListener.java index 9e4780b9..90bfe81c 100644 --- a/src/main/java/link/locutus/discord/util/update/AllianceListener.java +++ b/src/main/java/link/locutus/discord/util/update/AllianceListener.java @@ -125,7 +125,7 @@ public static void runMilitarizationAlerts() { double thresholdDaily = 0.05; double thresholdTurnly = 0.1; - double thresholdMin = 0.4; + double thresholdMin = 0.2; Map milPreviousMap = new HashMap<>(); Map milNowMap = new HashMap<>();