diff --git a/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java b/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java index ae47f2e39..3eb133410 100644 --- a/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java +++ b/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java @@ -29,7 +29,6 @@ import net.draycia.carbon.common.messages.CarbonMessageRenderer; import net.draycia.carbon.common.messages.RenderForTagResolver; import net.draycia.carbon.common.messages.SourcedAudience; -import net.draycia.carbon.common.users.ConsoleCarbonPlayer; import net.kyori.adventure.audience.Audience; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -74,17 +73,10 @@ public Component render( } } } - final Audience parseAudience; - if (receiver instanceof SourcedAudience sourced) { - if (sourced.recipient() instanceof ConsoleCarbonPlayer) { - parseAudience = MiniPlaceholdersUtil.wrapAudiences(miniplaceholdersConfig, sourced.sender(), sourced.sender()); - } else { - parseAudience = MiniPlaceholdersUtil.wrapAudiences(miniplaceholdersConfig, sourced.recipient(), sourced.sender()); - } - } else { - parseAudience = receiver; - } + final Audience parseAudience = receiver instanceof SourcedAudience sourced + ? MiniPlaceholdersUtil.wrapAudiences(miniplaceholdersConfig, sourced.recipient(), sourced.sender()) + : receiver; return MiniMessage.miniMessage().deserialize(placeholderResolvedMessage, parseAudience, tagResolver.build()); }