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

@@ -29,10 +29,10 @@ index d44b88185ce58346007c6ef70b76f8e0df23e95c..4b7497acc5b26da48375625b4a31fb05
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ef75a80793a5a36177dd99879d19a91a52077e95..d4fbbfbbf96c7cb843d7867289a51febef36218f 100644
index 7adae0150198a35f3e7cec8916b38a998e2bd43e..e4b1019b89febf04e544208ccabc43798ccd44ef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -419,6 +419,11 @@ public class PurpurWorldConfig {
@@ -431,6 +431,11 @@ public class PurpurWorldConfig {
}
}