This commit is contained in:
gnembon committed 2021-04-19 03:57:59 -03:00
1 parent d636965f59
commit e438fbf56d
2 files changed
+4 -5

No files matched your search

@@ -120,8 +120,8 @@ public class HUDController
for (ServerPlayerEntity player: targets) for (ServerPlayerEntity player: targets)
{ {
PacketByteBuf packetData = new PacketByteBuf(Unpooled.buffer()). PacketByteBuf packetData = new PacketByteBuf(Unpooled.buffer()).
writeText(new LiteralText("")). writeText(scarpet_headers.getOrDefault(player, new LiteralText(""))).
writeText(Messenger.c(player_huds.get(player).toArray(new Object[0]))); writeText(Messenger.c(player_huds.getOrDefault(player, Collections.emptyList()).toArray(new Object[0])));
PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket(packetData); PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket(packetData);
//PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket(); //PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket();
@@ -552,7 +552,7 @@ public class Auxiliary {
if (player == null) throw new InternalExpressionException("'display_title' requires a valid online player or a list of players as first argument. "+v.getString()+" is not a player."); if (player == null) throw new InternalExpressionException("'display_title' requires a valid online player or a list of players as first argument. "+v.getString()+" is not a player.");
return player; return player;
}); });
Function<Text, Packet<?>> packetGetter; Function<Text, Packet<?>> packetGetter = null;
//TitleS2CPacket.Action action; //TitleS2CPacket.Action action;
String actionString = lv.get(1).evalValue(c).getString().toLowerCase(Locale.ROOT); String actionString = lv.get(1).evalValue(c).getString().toLowerCase(Locale.ROOT);
switch (actionString) switch (actionString)
@@ -584,7 +584,6 @@ public class Auxiliary {
break; break;
case "player_list_header": case "player_list_header":
case "player_list_footer": case "player_list_footer":
action = null;
break; break;
default: default:
throw new InternalExpressionException("'display_title' requires 'title', 'subtitle', 'actionbar', 'player_list_header', 'player_list_footer' or 'clear' as second argument"); throw new InternalExpressionException("'display_title' requires 'title', 'subtitle', 'actionbar', 'player_list_header', 'player_list_footer' or 'clear' as second argument");
@@ -608,7 +607,7 @@ public class Auxiliary {
} }
} }
else title = null; // Will never happen, just to make lambda happy else title = null; // Will never happen, just to make lambda happy
if (action == null) if (packetGetter == null)
{ {
Map<ServerPlayerEntity, BaseText> map; Map<ServerPlayerEntity, BaseText> map;
if (actionString.equals("player_list_header")) if (actionString.equals("player_list_header"))