Merge branch '2.x' into fix-5727
This commit is contained in:
commit
fefaeceedd
|
@ -36,7 +36,9 @@ public class CommandSource {
|
|||
}
|
||||
|
||||
final String translation = tlLiteral(tlKey, args);
|
||||
sendComponent(AdventureUtil.miniMessage().deserialize(translation));
|
||||
if (!translation.isEmpty()) {
|
||||
sendComponent(AdventureUtil.miniMessage().deserialize(translation));
|
||||
}
|
||||
}
|
||||
|
||||
public String tl(final String tlKey, final Object... args) {
|
||||
|
|
|
@ -69,6 +69,9 @@ public final class Console implements IMessageRecipient {
|
|||
@Override
|
||||
public void sendTl(String tlKey, Object... args) {
|
||||
final String translation = tlLiteral(tlKey, args);
|
||||
if (translation.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
final Audience consoleAudience = ((Essentials) ess).getBukkitAudience().sender(getCommandSender());
|
||||
final Component component = AdventureUtil.miniMessage()
|
||||
|
|
|
@ -1200,7 +1200,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
|
|||
|
||||
@Override
|
||||
public void broadcastTl(final String tlKey, final Object... args) {
|
||||
broadcastTl(null, null, true, tlKey, args);
|
||||
broadcastTl(null, null, false, tlKey, args);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -21,9 +21,10 @@ public class SignHeal extends EssentialsSign {
|
|||
if (player.getBase().getHealth() == 0) {
|
||||
throw new SignException("healDead");
|
||||
}
|
||||
final double amount = player.getBase().getMaxHealth();
|
||||
final Trade charge = getTrade(sign, 1, ess);
|
||||
charge.isAffordableFor(player);
|
||||
player.getBase().setHealth(20);
|
||||
player.getBase().setHealth(amount);
|
||||
player.getBase().setFoodLevel(20);
|
||||
player.getBase().setFireTicks(0);
|
||||
player.sendTl("youAreHealed");
|
||||
|
|
|
@ -50,7 +50,7 @@ public final class AdventureUtil {
|
|||
}
|
||||
LEGACY_SERIALIZER = builder.build();
|
||||
|
||||
MINI_MESSAGE_NO_TAGS = MiniMessage.miniMessage();
|
||||
MINI_MESSAGE_NO_TAGS = MiniMessage.builder().strict(true).build();
|
||||
|
||||
miniMessageInstance = createMiniMessageInstance();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue