icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source 
# Conflicts:
#	src/main/java/carpet/logging/HUDController.java
This commit is contained in:
gnembon committed 2021-06-25 22:45:49 -03:00
2 parents ac24a67c00 096e62b865
commit 3073bcfe4b
3 files changed
+15 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/annotation/FunctionsTestClass.java
+3 -3
View File
@@ -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 -> {