Release 3.2.11

AlessioDP · Aug 6, 2023 · 464528c · 464528c
1 parent 843c1c7
commit 464528c
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 27 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parties</artifactId>
 		<groupId>com.alessiodp.parties</groupId>
-		<version>3.2.10</version>
+		<version>3.2.11</version>
 	</parent>
 
 	<artifactId>parties-api</artifactId>

diff --git a/bukkit/dependency-reduced-pom.xml b/bukkit/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>parties</artifactId>
     <groupId>com.alessiodp.parties</groupId>
-    <version>3.2.10</version>
+    <version>3.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>parties-bukkit</artifactId>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.alessiodp.parties</groupId>
       <artifactId>parties-common</artifactId>
-      <version>3.2.10</version>
+      <version>3.2.11</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parties</artifactId>
 		<groupId>com.alessiodp.parties</groupId>
-		<version>3.2.10</version>
+		<version>3.2.11</version>
 	</parent>
 
 	<artifactId>parties-bukkit</artifactId>

diff --git a/bungeecord/dependency-reduced-pom.xml b/bungeecord/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>parties</artifactId>
     <groupId>com.alessiodp.parties</groupId>
-    <version>3.2.10</version>
+    <version>3.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>parties-bungeecord</artifactId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.alessiodp.parties</groupId>
       <artifactId>parties-common</artifactId>
-      <version>3.2.10</version>
+      <version>3.2.11</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parties</artifactId>
 		<groupId>com.alessiodp.parties</groupId>
-		<version>3.2.10</version>
+		<version>3.2.11</version>
 	</parent>
 
 	<artifactId>parties-bungeecord</artifactId>

diff --git a/common/dependency-reduced-pom.xml b/common/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>parties</artifactId>
     <groupId>com.alessiodp.parties</groupId>
-    <version>3.2.10</version>
+    <version>3.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>parties-common</artifactId>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>com.alessiodp.parties</groupId>
       <artifactId>parties-api</artifactId>
-      <version>3.2.10</version>
+      <version>3.2.11</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>

diff --git a/common/pom.xml b/common/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parties</artifactId>
 		<groupId>com.alessiodp.parties</groupId>
-		<version>3.2.10</version>
+		<version>3.2.11</version>
 	</parent>
 
 	<artifactId>parties-common</artifactId>

diff --git a/common/src/main/java/com/alessiodp/parties/common/addons/external/hooks/LuckPermsHook.java b/common/src/main/java/com/alessiodp/parties/common/addons/external/hooks/LuckPermsHook.java
@@ -2,6 +2,7 @@
 
 import com.alessiodp.core.common.ADPPlugin;
 import com.alessiodp.core.common.configuration.Constants;
+import com.alessiodp.core.common.utils.CommonUtils;
 import lombok.RequiredArgsConstructor;
 import net.luckperms.api.LuckPerms;
 import net.luckperms.api.LuckPermsProvider;
@@ -29,15 +30,15 @@ public boolean register() {
 	public String getPlayerPrefix(UUID uuid) {
 		User user = api.getUserManager().getUser(uuid);
 		if (user != null) {
-			return user.getCachedData().getMetaData().getPrefix();
+			return CommonUtils.getOr(user.getCachedData().getMetaData().getPrefix(), "");
 		}
 		return "";
 	}
 
 	public String getPlayerSuffix(UUID uuid) {
 		User user = api.getUserManager().getUser(uuid);
 		if (user != null) {
-			return user.getCachedData().getMetaData().getSuffix();
+			return CommonUtils.getOr(user.getCachedData().getMetaData().getSuffix(), "");
 		}
 		return "";
 	}

diff --git a/common/src/main/java/com/alessiodp/parties/common/utils/MessageUtils.java b/common/src/main/java/com/alessiodp/parties/common/utils/MessageUtils.java
@@ -67,7 +67,7 @@ public String convertRawPlaceholder(String placeholder, PartyPlayerImpl player,
 			ret = newPlaceholder.formatPlaceholder(player, party, placeholder, emptyPlaceholder);
 		}
 		// LuckPerms
-		if (ret != null && player != null) {
+		if (ret == null && player != null) {
 			ret = LuckPermsHandler.parsePlaceholders("%" + placeholder + "%", player);
 		}
 		return ret;

diff --git a/common/src/test/java/com/alessiodp/parties/common/addons/PartiesPlaceholderTest.java b/common/src/test/java/com/alessiodp/parties/common/addons/PartiesPlaceholderTest.java
@@ -267,24 +267,24 @@ else if (((int) args.getArgument(2)) == 2)
 		PartiesPlaceholder placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_name_1");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_NAME_NUMBER, placeholder);
-		assertEquals(party1.getName(), placeholder.formatPlaceholder(null, null, "list_parties_by_name_1"));
+		assertEquals(party1.getName(), placeholder.formatPlaceholder(player1, null, "list_parties_by_name_1"));
 
 		placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_name_2");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_NAME_NUMBER, placeholder);
-		assertEquals(party2.getName(), placeholder.formatPlaceholder(null, null, "list_parties_by_name_2"));
+		assertEquals(party2.getName(), placeholder.formatPlaceholder(player1, null, "list_parties_by_name_2"));
 
 		// No more parties
 		placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_name_4");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_NAME_NUMBER, placeholder);
-		assertEquals("", placeholder.formatPlaceholder(null, null, "list_parties_by_name_4"));
+		assertEquals("", placeholder.formatPlaceholder(player1, null, "list_parties_by_name_4"));
 
 		// Placeholder
 		placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_name_1_id");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_NAME_NUMBER_PLACEHOLDER, placeholder);
-		assertEquals(party1.getId().toString(), placeholder.formatPlaceholder(null, null, "list_parties_by_name_1_id"));
+		assertEquals(party1.getId().toString(), placeholder.formatPlaceholder(player1, null, "list_parties_by_name_1_id"));
 	}
 
 	@Test
@@ -302,24 +302,24 @@ else if (((int) args.getArgument(2)) == 2)
 		PartiesPlaceholder placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_online_members_1");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_ONLINE_MEMBERS_NUMBER, placeholder);
-		assertEquals(party3.getName(), placeholder.formatPlaceholder(null, null, "list_parties_by_online_members_1"));
+		assertEquals(party3.getName(), placeholder.formatPlaceholder(player1, null, "list_parties_by_online_members_1"));
 
 		placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_online_members_2");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_ONLINE_MEMBERS_NUMBER, placeholder);
-		assertEquals(party2.getName(), placeholder.formatPlaceholder(null, null, "list_parties_by_online_members_2"));
+		assertEquals(party2.getName(), placeholder.formatPlaceholder(player1, null, "list_parties_by_online_members_2"));
 
 		// No more parties
 		placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_online_members_4");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_ONLINE_MEMBERS_NUMBER, placeholder);
-		assertEquals("", placeholder.formatPlaceholder(null, null, "list_parties_by_online_members_4"));
+		assertEquals("", placeholder.formatPlaceholder(player1, null, "list_parties_by_online_members_4"));
 
 		// Placeholder
 		placeholder = PartiesPlaceholder.getPlaceholder("list_parties_by_online_members_1_id");
 
 		assertEquals(PartiesPlaceholder.LIST_PARTIES_BY_ONLINE_MEMBERS_NUMBER_PLACEHOLDER, placeholder);
-		assertEquals(party3.getId().toString(), placeholder.formatPlaceholder(null, null, "list_parties_by_online_members_1_id"));
+		assertEquals(party3.getId().toString(), placeholder.formatPlaceholder(player1, null, "list_parties_by_online_members_1_id"));
 	}
 
 	@Test

diff --git a/output/dependency-reduced-pom.xml b/output/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>parties</artifactId>
     <groupId>com.alessiodp.parties</groupId>
-    <version>3.2.10</version>
+    <version>3.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>output</artifactId>

diff --git a/output/pom.xml b/output/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>parties</artifactId>
 		<groupId>com.alessiodp.parties</groupId>
-		<version>3.2.10</version>
+		<version>3.2.11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>com.alessiodp.parties</groupId>
 	<artifactId>parties</artifactId>
-	<version>3.2.10</version>
+	<version>3.2.11</version>
 	<packaging>pom</packaging>
 
 	<name>Parties</name>

diff --git a/velocity/dependency-reduced-pom.xml b/velocity/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>parties</artifactId>
     <groupId>com.alessiodp.parties</groupId>
-    <version>3.2.10</version>
+    <version>3.2.11</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>parties-velocity</artifactId>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.alessiodp.parties</groupId>
       <artifactId>parties-common</artifactId>
-      <version>3.2.10</version>
+      <version>3.2.11</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>parties</artifactId>
 		<groupId>com.alessiodp.parties</groupId>
-		<version>3.2.10</version>
+		<version>3.2.11</version>
 	</parent>
 
 	<artifactId>parties-velocity</artifactId>