Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' into fix-5727

This commit is contained in:
Josh Roy 2024-04-07 21:18:31 -04:00 committed by GitHub
parent 63f85a1f41 71ca7ffbf6
commit fefaeceedd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/main/java/com/earth2me/essentials/CommandSource.java
View File

@ -36,7 +36,9 @@ public class CommandSource {
} }
final String translation = tlLiteral(tlKey, args); 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) { public String tl(final String tlKey, final Object... args) {

3
Essentials/src/main/java/com/earth2me/essentials/Console.java
View File

@ -69,6 +69,9 @@ public final class Console implements IMessageRecipient {
@Override @Override
public void sendTl(String tlKey, Object... args) { public void sendTl(String tlKey, Object... args) {
final String translation = tlLiteral(tlKey, args); final String translation = tlLiteral(tlKey, args);
if (translation.isEmpty()) {
return;
}
final Audience consoleAudience = ((Essentials) ess).getBukkitAudience().sender(getCommandSender()); final Audience consoleAudience = ((Essentials) ess).getBukkitAudience().sender(getCommandSender());
final Component component = AdventureUtil.miniMessage() final Component component = AdventureUtil.miniMessage()

2
Essentials/src/main/java/com/earth2me/essentials/Essentials.java
View File

@ -1200,7 +1200,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
@Override @Override
public void broadcastTl(final String tlKey, final Object... args) { public void broadcastTl(final String tlKey, final Object... args) {
broadcastTl(null, null, true, tlKey, args); broadcastTl(null, null, false, tlKey, args);
} }
@Override @Override

3
Essentials/src/main/java/com/earth2me/essentials/signs/SignHeal.java
View File

@ -21,9 +21,10 @@ public class SignHeal extends EssentialsSign {
if (player.getBase().getHealth() == 0) { if (player.getBase().getHealth() == 0) {
throw new SignException("healDead"); throw new SignException("healDead");
} }
final double amount = player.getBase().getMaxHealth();
final Trade charge = getTrade(sign, 1, ess); final Trade charge = getTrade(sign, 1, ess);
charge.isAffordableFor(player); charge.isAffordableFor(player);
player.getBase().setHealth(20); player.getBase().setHealth(amount);
player.getBase().setFoodLevel(20); player.getBase().setFoodLevel(20);
player.getBase().setFireTicks(0); player.getBase().setFireTicks(0);
player.sendTl("youAreHealed"); player.sendTl("youAreHealed");

2
Essentials/src/main/java/com/earth2me/essentials/utils/AdventureUtil.java
View File

@ -50,7 +50,7 @@ public final class AdventureUtil {
} }
LEGACY_SERIALIZER = builder.build(); LEGACY_SERIALIZER = builder.build();
MINI_MESSAGE_NO_TAGS = MiniMessage.miniMessage(); MINI_MESSAGE_NO_TAGS = MiniMessage.builder().strict(true).build();
miniMessageInstance = createMiniMessageInstance(); miniMessageInstance = createMiniMessageInstance();
} }