Rebase on latest Purpur (#230)

This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions

View File

@@ -73,7 +73,7 @@ index 987301bfb9d963e3bebc2653bd95cf7f17a2a1e4..fd61c18905e81b1b193260f1c32b4ad0
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6faa180bb2a5aa3bd8c4b4845848a63b9366f1eb..b50c740b799062240e65625cbf44c32ee07f3551 100644
index c356757bc6c3cca467c0f3839723391c9fc3347e..26cd01fa0aefe9703b11b18468b21898cf5ba2a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -202,6 +202,11 @@ public class PurpurConfig {