Merge similar grindstone patches

This commit is contained in:
Encode42
2022-01-17 19:07:07 -05:00
parent b639309492
commit b8235eed8d
5 changed files with 29 additions and 57 deletions

View File

@@ -18,10 +18,10 @@ index 3fa13053722387db199f482307559219c381f4da..fd0f5b13c4254dd976a38a6e60d9e156
char c = in.charAt(i);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index ccffa0ffac58da97334c7f1a95f28b1a485f9303..7d3f8eb6db6193b8151d732232171a9a455e1470 100644
index ee01d9b20e5d16110d57083dcf216cc279e8dfec..1a038bac86eb2af4c426556c1738af2b3b7f1045 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -407,4 +407,11 @@ public class PurpurConfig {
@@ -409,4 +409,11 @@ public class PurpurConfig {
private static void networkSettings() {
useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
}