From 38458492e69eb597bd9a49b84fcef59efab6a153 Mon Sep 17 00:00:00 2001
From: Sophia Atkinson <sophialul@protonmail.com>
Date: Wed, 7 May 2025 23:59:32 -0700
Subject: [PATCH] fix /pronouns reset command Fix crash when resetting pronouns
 due to null value in database write

---
 pom.xml                                               |  4 ++--
 .../com/sophiaatkinson/pronouns/PronounsPlugin.java   | 11 +++++++++++
 src/main/resources/config.yml                         | 10 +++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3cda17b..d189782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.sophiaatkinson</groupId>
     <artifactId>PronounsPlugin</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
     <packaging>jar</packaging>
 
     <name>PronounsPlugin</name>
@@ -37,7 +37,7 @@
     <dependency>
         <groupId>me.clip</groupId>
         <artifactId>placeholderapi</artifactId>
-        <version>2.11.7</version>
+        <version>2.11.7-DEV-207</version>
         <scope>system</scope>
         <!-- Make sure this path is correct -->
         <systemPath>${project.basedir}/lib/PlaceholderAPI-2.11.7-DEV-207.jar</systemPath>
diff --git a/src/main/java/com/sophiaatkinson/pronouns/PronounsPlugin.java b/src/main/java/com/sophiaatkinson/pronouns/PronounsPlugin.java
index 37b6800..f476cd7 100644
--- a/src/main/java/com/sophiaatkinson/pronouns/PronounsPlugin.java
+++ b/src/main/java/com/sophiaatkinson/pronouns/PronounsPlugin.java
@@ -68,6 +68,17 @@ public class PronounsPlugin extends JavaPlugin {
     }
 
     public void setPronouns(UUID uuid, String pronouns) {
+        if (pronouns == null) {
+            try (PreparedStatement ps = connection.prepareStatement("DELETE FROM pronouns WHERE uuid = ?")) {
+                ps.setString(1, uuid.toString());
+                ps.executeUpdate();
+            } catch (SQLException e) {
+                errorLog.add("Database delete error: " + e.getMessage());
+                e.printStackTrace();
+            }
+            return;
+        }
+    
         for (String blocked : blockedPronouns) {
             if (pronouns.contains(blocked)) {
                 return;
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index d0a6f4d..24ed719 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -17,11 +17,11 @@ blocked-pronouns:
   - "spic"
 
 pronoun-suggestions:
-  - "she/her"
-  - "he/him"
-  - "they/them"
-  - "xe/xem"
-  - "it/its"
+  - "She/Her"
+  - "He/Him"
+  - "They/Them"
+  - "Xe/Xem"
+  - "It/Its"
 
 debug: true