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

@@ -37,10 +37,10 @@ index ee1f0ccce5c5c920b2595ced9e72fd1544e2459a..fcbbf100990faf60250357b744cbd587
this.inPortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 01304a630d22a7de1a6d8beb8d9753a36a31fc42..82b4ece3c12d8180b7ab275c3f240e94578177fc 100644
index 28648fc6cfd5592071d3f0674e6e72bcadb0b7f1..f75838c6b1f5788b2e18a6f7af5bee8023fd37e7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -350,6 +350,11 @@ public class PurpurWorldConfig {
@@ -362,6 +362,11 @@ public class PurpurWorldConfig {
});
}