Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java

src/main/java/carpet/script/utils/FixedCommandSource.java

@@ -80,12 +80,6 @@ public class FixedCommandSource extends ServerCommandSource
         return this;
     }
 
-    @Override
-    public ServerCommandSource mergeConsumers(ResultConsumer<ServerCommandSource> consumer, BinaryOperator<ResultConsumer<ServerCommandSource>> binaryOperator)
-    {
-        return this.withConsumer(binaryOperator.apply(this.resultConsumer, consumer));
-    }
-
     @Override
     public ServerCommandSource withSilent()
     {
@@ -190,6 +184,7 @@ public class FixedCommandSource extends ServerCommandSource
     @Override
     public void onCommandComplete(CommandContext<ServerCommandSource> context, boolean success, int result)
     {
+        if (this.resultConsumer != null) resultConsumer.onCommandComplete(context, success, result);
     }
 
     @Override