diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index b97ce84a..fe8f1532 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -28,30 +28,30 @@ public class ClientNetworkHandler CompoundTag ruleset = (CompoundTag)t; for (String fullRuleName: ruleset.getKeys()) { - int separatorPos = fullRuleName.indexOf(':'); - SettingsManager manager = null; - String ruleName; - if (separatorPos > -1) - { - String identifier = fullRuleName.substring(0,separatorPos); - ruleName = fullRuleName.substring(separatorPos + 1); - for (CarpetExtension extension:CarpetServer.extensions) { - SettingsManager eManager = extension.customSettingsManager(); - if (eManager != null && identifier.equals(eManager.getIdentifier())) - { - manager = eManager; - break; - } - } - } - else - { - ruleName = fullRuleName; - manager = CarpetServer.settingsManager; - } + int separatorPos = fullRuleName.indexOf(':'); + SettingsManager manager = null; + String ruleName; + if (separatorPos > -1) + { + String identifier = fullRuleName.substring(0, separatorPos); + ruleName = fullRuleName.substring(separatorPos + 1); + for (CarpetExtension extension: CarpetServer.extensions) { + SettingsManager eManager = extension.customSettingsManager(); + if (eManager != null && identifier.equals(eManager.getIdentifier())) + { + manager = eManager; + break; + } + } + } + else + { + ruleName = fullRuleName; + manager = CarpetServer.settingsManager; + } ParsedRule rule = (manager != null) ? manager.getRule(ruleName) : null; if (rule == null) - CarpetSettings.LOG.error("Received unknown rule: "+fullRuleName); + CarpetSettings.LOG.error("Received unknown rule: " + fullRuleName); else { CompoundTag ruleNBT = (CompoundTag) ruleset.get(fullRuleName); diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index fc15c575..140e6dfd 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -80,10 +80,10 @@ public class ServerNetworkHandler DataBuilder data = DataBuilder.create().withTickRate(); CarpetServer.settingsManager.getRules().forEach(data::withRule); CarpetServer.extensions.forEach(e -> { - SettingsManager eManager = e.customSettingsManager(); - if (eManager != null) { - eManager.getRules().forEach(data::withRule); - } + SettingsManager eManager = e.customSettingsManager(); + if (eManager != null) { + eManager.getRules().forEach(data::withRule); + } }); playerEntity.networkHandler.sendPacket(new CustomPayloadS2CPacket(CarpetClient.CARPET_CHANNEL, data.build() )); }