From c4ce5e7399738382167d328b9469fd37355f1c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= Date: Mon, 24 Oct 2022 23:05:07 +0200 Subject: [PATCH] Fix PAPI issues when pronouns haven't been set --- src/main/java/wtf/beatrice/nounspicker/objects/PAPIManager.java | 2 ++ .../java/wtf/beatrice/nounspicker/utils/DatabaseManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/wtf/beatrice/nounspicker/objects/PAPIManager.java b/src/main/java/wtf/beatrice/nounspicker/objects/PAPIManager.java index 3d62fbf..94daeaf 100644 --- a/src/main/java/wtf/beatrice/nounspicker/objects/PAPIManager.java +++ b/src/main/java/wtf/beatrice/nounspicker/objects/PAPIManager.java @@ -70,8 +70,10 @@ public class PAPIManager extends PlaceholderExpansion return Cache.dbManager.getPronounFormat(pronounId); case "full_tag": pronounId = Cache.dbManager.getPlayerPronounId(player.getName(), 0); + if(pronounId < 0) return ""; String mainPronounFormat = Cache.dbManager.getPronounFormat(pronounId); pronounId = Cache.dbManager.getPlayerPronounId(player.getName(), 1); + if(pronounId < 0) return ""; String secondaryPronounFormat = Cache.dbManager.getPronounFormat(pronounId); return baseFormat.replace("%main%", mainPronounFormat) .replace("%secondary%", secondaryPronounFormat); diff --git a/src/main/java/wtf/beatrice/nounspicker/utils/DatabaseManager.java b/src/main/java/wtf/beatrice/nounspicker/utils/DatabaseManager.java index 4564437..484bc22 100644 --- a/src/main/java/wtf/beatrice/nounspicker/utils/DatabaseManager.java +++ b/src/main/java/wtf/beatrice/nounspicker/utils/DatabaseManager.java @@ -260,6 +260,8 @@ public class DatabaseManager } public String getPronounFormat(int pronounId) { + if(pronounId < 0) return ""; + String query = "SELECT format FROM pronouns " + "WHERE id = " + pronounId + " " + "LIMIT 1;";