Fix issue for chat messages showing null when a system tag is not set

Omnipico · May 22, 2022 · b76670c · b76670c
1 parent a596a1a
commit b76670c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 .idea/
+target/
 
 # Package Files #
 *.jar

diff --git a/PluralKitMC.iml b/PluralKitMC.iml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+          <platformType>BUNGEECORD</platformType>
+          <platformType>BUKKIT</platformType>
+          <platformType>ADVENTURE</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <groupId>com.omnipico.pluralkitmc</groupId>
     <artifactId>PluralKitMC</artifactId>
     <packaging>jar</packaging>
-    <version>v0_4_12</version>
+    <version>v0_4_13</version>
 
     <repositories>
         <repository>

diff --git a/src/main/java/com/omnipico/pluralkitmc/ProxyListener.java b/src/main/java/com/omnipico/pluralkitmc/ProxyListener.java
@@ -112,7 +112,13 @@ public void onChat(AsyncPlayerChatEvent event) {
         PluralKitMember proxiedMember = data.getProxiedUser(player.getUniqueId(), message);
         PluralKitProxy pluralKitProxy = data.getProxy(player.getUniqueId(), message);
         if (proxiedMember != null && system != null) {
-            String memberName = proxiedMember.name + " " + data.getSystemTag(player.getUniqueId());
+            String systemTag = data.getSystemTag(player.getUniqueId());
+            String memberName;
+            if (systemTag != null && systemTag.length() > 0) {
+                memberName = proxiedMember.name + " " + systemTag;
+            } else {
+                memberName = proxiedMember.name;
+            }
             int prefixLength = pluralKitProxy.prefix != null ? pluralKitProxy.prefix.length() : 0;
             int suffixLength = pluralKitProxy.suffix != null ? pluralKitProxy.suffix.length() : 0;
             message = message.substring(prefixLength, message.length()-suffixLength);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: PluralKitMC
-version: 0.4.12
+version: 0.4.13
 author: Allymonies
 main: com.omnipico.pluralkitmc.PluralKitMC
 api-version: 1.18

diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
@@ -1,5 +1,5 @@
 name: PluralKitMC
-version: 0.4.12
+version: 0.4.13
 author: Allymonies
 main: com.omnipico.pluralkitmc.PluralKitMC
 api-version: 1.18

diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Feb 08 20:49:25 EST 2022
+#Sun May 22 12:22:04 PDT 2022
 groupId=com.omnipico.pluralkitmc
 artifactId=PluralKitMC
-version=v0_4_12
+version=v0_4_13
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -1,9 +1,9 @@
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\UserCache.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitMember.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\ProxyListener.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitSystem.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitMC.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitData.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\ChatUtils.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\CommandPK.java
-C:\Users\ally\Documents\GitHub\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitProxy.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitMC.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\ProxyListener.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitSystem.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\UserCache.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitData.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitMember.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\ChatUtils.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\PluralKitProxy.java
+C:\Users\alyssa\Documents\Ally_Projects\Omnipico\PluralKitMC\src\main\java\com\omnipico\pluralkitmc\CommandPK.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     # Mobile Tools for Java (J2ME)
     .mtj.tmp/
     .idea/
+    target/
     # Package Files #
     *.jar
@@ Expand Down @@