Update adventure and fix command perm serialization NPE (#6729)
This commit is contained in:
		
					parent
					
						
							
								5f9ed411df
							
						
					
				
			
			
				commit
				
					
						31f57a86a6
					
				
			
		
					 1 changed files with 12 additions and 2 deletions
				
			
		| 
						 | 
					@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
     withJavadocJar()
 | 
					     withJavadocJar()
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
+val adventureVersion = "4.9.1"
 | 
					+val adventureVersion = "4.9.2"
 | 
				
			||||||
+val apiAndDocs by configurations.creating {
 | 
					+val apiAndDocs by configurations.creating {
 | 
				
			||||||
+    attributes {
 | 
					+    attributes {
 | 
				
			||||||
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
 | 
					+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
 | 
				
			||||||
| 
						 | 
					@ -1258,7 +1258,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
+    @Deprecated // Paper
 | 
					+    @Deprecated // Paper
 | 
				
			||||||
     public String getPermissionMessage() {
 | 
					     public String getPermissionMessage() {
 | 
				
			||||||
-        return permissionMessage;
 | 
					-        return permissionMessage;
 | 
				
			||||||
+        return io.papermc.paper.text.PaperComponents.legacySectionSerializer().serialize(permissionMessage); // Paper
 | 
					+        return io.papermc.paper.text.PaperComponents.legacySectionSerializer().serializeOrNull(permissionMessage); // Paper
 | 
				
			||||||
     }
 | 
					     }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
     /**
 | 
					     /**
 | 
				
			||||||
| 
						 | 
					@ -1281,10 +1281,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 | 
				
			||||||
         return this;
 | 
					         return this;
 | 
				
			||||||
     }
 | 
					     }
 | 
				
			||||||
+    // Paper start
 | 
					+    // Paper start
 | 
				
			||||||
 | 
					+    /**
 | 
				
			||||||
 | 
					+     * Gets the permission message.
 | 
				
			||||||
 | 
					+     *
 | 
				
			||||||
 | 
					+     * @return the permission message
 | 
				
			||||||
 | 
					+     */
 | 
				
			||||||
+    public @Nullable net.kyori.adventure.text.Component permissionMessage() {
 | 
					+    public @Nullable net.kyori.adventure.text.Component permissionMessage() {
 | 
				
			||||||
+        return this.permissionMessage;
 | 
					+        return this.permissionMessage;
 | 
				
			||||||
+    }
 | 
					+    }
 | 
				
			||||||
+
 | 
					+
 | 
				
			||||||
 | 
					+    /**
 | 
				
			||||||
 | 
					+     * Sets the permission message.
 | 
				
			||||||
 | 
					+     *
 | 
				
			||||||
 | 
					+     * @param permissionMessage the permission message
 | 
				
			||||||
 | 
					+     */
 | 
				
			||||||
+    public void permissionMessage(@Nullable net.kyori.adventure.text.Component permissionMessage) {
 | 
					+    public void permissionMessage(@Nullable net.kyori.adventure.text.Component permissionMessage) {
 | 
				
			||||||
+        this.permissionMessage = permissionMessage;
 | 
					+        this.permissionMessage = permissionMessage;
 | 
				
			||||||
+    }
 | 
					+    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue