Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/logging/HUDController.java

src/main/java/carpet/logging/HUDController.java

@@ -44,10 +44,10 @@ public class HUDController
     }
 
     public static Map<ServerPlayerEntity, List<BaseText>> player_huds = new HashMap<>();
+//keyed with player names so unlogged players don't hold the reference
+    public static final Map<String, BaseText> scarpet_headers = new HashMap<>();
 
-    public static final Map<ServerPlayerEntity, BaseText> scarpet_headers = new HashMap<>();
-
-    public static final Map<ServerPlayerEntity, BaseText> scarpet_footers = new HashMap<>();
+    public static final Map<String, BaseText> scarpet_footers = new HashMap<>();
 
     public static void resetScarpetHUDs() {
         scarpet_headers.clear();
@@ -56,6 +56,7 @@ public class HUDController
 
     public static void addMessage(ServerPlayerEntity player, BaseText hudMessage)
     {
+        if (player == null) return;
         if (!player_huds.containsKey(player))
         {
             player_huds.put(player, new ArrayList<>());
@@ -83,7 +84,10 @@ public class HUDController
 
         player_huds.clear();
 
-        scarpet_footers.forEach(HUDController::addMessage);
+        server.getPlayerManager().getPlayerList().forEach(p -> {
+            BaseText scarpetFOoter = scarpet_footers.get(p.getEntityName());
+            if (scarpetFOoter != null) HUDController.addMessage(p, scarpetFOoter);
+        });
 
         if (LoggerRegistry.__tps)
             LoggerRegistry.getLogger("tps").log(()-> send_tps_display(server));
@@ -125,7 +129,7 @@ public class HUDController
             PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket(packetData);
 
             //PlayerListHeaderS2CPacket packet = new PlayerListHeaderS2CPacket();
-            //((PlayerListHeaderS2CPacketMixin)packet).setHeader(scarpet_headers.getOrDefault(player, new LiteralText("")));
+            //((PlayerListHeaderS2CPacketMixin)packet).setHeader(scarpet_headers.getOrDefault(player.getEntityName(), new LiteralText("")));
             //((PlayerListHeaderS2CPacketMixin)packet).setFooter(Messenger.c(player_huds.getOrDefault(player, Collections.emptyList()).toArray(new Object[0])));
             player.networkHandler.sendPacket(packet);
         }

src/main/java/carpet/script/annotation/FunctionsTestClass.java

@@ -42,13 +42,13 @@ public class FunctionsTestClass {
 	    }
 	    if (action == null) // Player list
 	    {
-	        Map<ServerPlayerEntity, BaseText> map = actionString.equals("player_list_header") ? HUDController.scarpet_headers : HUDController.scarpet_footers;
+	        Map<String, BaseText> map = actionString.equals("player_list_header") ? HUDController.scarpet_headers : HUDController.scarpet_footers;
 	        if (!content.isPresent()) // null
 	            for (ServerPlayerEntity p : targets)
-	                map.remove(p);
+	                map.remove(p.getEntityName());
 	        else
 	            for (ServerPlayerEntity p : targets)
-	                map.put(p, (BaseText) content.get());
+	                map.put(p.getEntityName(), (BaseText) content.get());
 	        return targets.size();
 	    }
 	    targets.forEach(p -> {

src/main/java/carpet/script/api/Auxiliary.java

@@ -572,7 +572,7 @@ public class Auxiliary {
             else title = null; // Will never happen, just to make lambda happy
             if (packetGetter == null)
             {
-                Map<ServerPlayerEntity, BaseText> map;
+                Map<String, BaseText> map;
                 if (actionString.equals("player_list_header"))
                     map = HUDController.scarpet_headers;
                 else
@@ -582,12 +582,12 @@ public class Auxiliary {
                 List<ServerPlayerEntity> targetList = targets.collect(Collectors.toList());
                 if (!soundsTrue) // null or empty string
                     targetList.forEach(target -> {
-                        map.remove(target);
+                        map.remove(target.getEntityName());
                         total.getAndIncrement();
                     });
                 else
                     targetList.forEach(target -> {
-                        map.put(target, (BaseText) title);
+                        map.put(target.getEntityName(), (BaseText) title);
                         total.getAndIncrement();
                     });
                 HUDController.update_hud(((CarpetContext)c).s.getMinecraftServer(), targetList);