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/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
This commit is contained in:
gnembon committed 2021-04-17 01:37:40 -03:00
2 parents d0fa948a46 3e24c24648
commit 8f2c935fe6
6 files changed
+96 -98
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/network/ClientNetworkHandler.java
+11 -4
View File
@@ -22,7 +22,7 @@ import java.util.function.BiConsumer;
public class ClientNetworkHandler
{
private static Map<String, BiConsumer<ClientPlayerEntity, NbtElement>> dataHandlers = new HashMap<String, BiConsumer<ClientPlayerEntity, NbtElement>>();
private static final Map<String, BiConsumer<ClientPlayerEntity, NbtElement>> dataHandlers = new HashMap<String, BiConsumer<ClientPlayerEntity, NbtElement>>();
static
{
dataHandlers.put("Rules", (p, t) -> {
@@ -61,7 +61,7 @@ public class ClientNetworkHandler
if (rule != null)
{
String value = ruleNBT.getString("Value");
rule.set(null, value);
try { rule.set(null, value); } catch (Exception ignored) { }
}
}
});
@@ -133,8 +133,15 @@ public class ClientNetworkHandler
if (compound == null) return;
for (String key: compound.getKeys())
{
if (dataHandlers.containsKey(key))
dataHandlers.get(key).accept(player, compound.get(key));
if (dataHandlers.containsKey(key)) {
try {
dataHandlers.get(key).accept(player, compound.get(key));
}
catch (Exception exc)
{
CarpetSettings.LOG.info("Corrupt carpet data for "+key);
}
}
else
CarpetSettings.LOG.error("Unknown carpet data: "+key);
}