Merge pull request #1179 from KyoriPowered/fix/missing-context

fix(minimessage): Carry over target into context deserialize calls

Author: kezz

text-minimessage/src/main/java/net/kyori/adventure/text/minimessage/ContextImpl.java

@@ -138,19 +138,21 @@ public UnaryOperator<String> preProcessor() {
 
   @Override
   public @NotNull Component deserialize(final @NotNull String message) {
-    return this.miniMessage.deserialize(requireNonNull(message, "message"), this.tagResolver);
+    return this.deserializeWithOptionalTarget(requireNonNull(message, "message"), this.tagResolver);
   }
 
   @Override
   public @NotNull Component deserialize(final @NotNull String message, final @NotNull TagResolver resolver) {
-    return this.miniMessage.deserialize(requireNonNull(message, "message"),
-      TagResolver.builder().resolver(this.tagResolver).resolver(requireNonNull(resolver, "resolver")).build());
+    requireNonNull(message, "message");
+    final TagResolver combinedResolver = TagResolver.builder().resolver(this.tagResolver).resolver(resolver).build();
+    return this.deserializeWithOptionalTarget(message, combinedResolver);
   }
 
   @Override
   public @NotNull Component deserialize(final @NotNull String message, final @NotNull TagResolver@NotNull... resolvers) {
-    return this.miniMessage.deserialize(requireNonNull(message, "message"),
-      TagResolver.builder().resolver(this.tagResolver).resolvers(requireNonNull(resolvers, "resolvers")).build());
+    requireNonNull(message, "message");
+    final TagResolver combinedResolver = TagResolver.builder().resolver(this.tagResolver).resolvers(resolvers).build();
+    return this.deserializeWithOptionalTarget(message, combinedResolver);
   }
 
   @Override
@@ -168,6 +170,14 @@ public UnaryOperator<String> preProcessor() {
     return new ParsingExceptionImpl(message, this.message, cause, false, tagsToTokens(((ArgumentQueueImpl<?>) tags).args));
   }
 
+  private @NotNull Component deserializeWithOptionalTarget(final @NotNull String message, final @NotNull TagResolver tagResolver) {
+    if (this.target != null) {
+      return this.miniMessage.deserialize(message, this.target, tagResolver);
+    } else {
+      return this.miniMessage.deserialize(message, tagResolver);
+    }
+  }
+
   private static Token[] tagsToTokens(final List<? extends Tag.Argument> tags) {
     final Token[] tokens = new Token[tags.size()];
     for (int i = 0, length = tokens.length; i < length; i++) {