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

@@ -70,10 +70,10 @@ index 453b46851f021d4285be123bedc8982fc8844da2..2a7695c899b12c87ab89d00116b6f0dd
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0173077fadaf6d61c3b516e3d783608ae72c4284..480d1791bf6b5c5ea51468fd8e16c571f558c5a0 100644
index 327adbf000c6b6e22126d0a8a0df661fc555a702..eb91425fa9bdbb2bd2a25e7362b99e2b6687da80 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -438,6 +438,16 @@ public class PurpurWorldConfig {
@@ -450,6 +450,16 @@ public class PurpurWorldConfig {
}
}