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

@@ -26,7 +26,7 @@ index 015f4d71f35a9d512814389b6e6cab74c0daf116..c7e20b25b4d09463fa54c66e62208e90
entityhuman.b(StatisticList.ITEM_USED.b(this));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a9f3cec879329101794afa3561bcff63a6db22bf..bc4caba06f469f700c89e96f1e70c7b2948329ad 100644
index 53a9208cd22b5057caef0dff5edc100297686422..c14fcd0c46b1f5ca6b827632cb37dd5f7e3eb6cd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -165,6 +165,15 @@ public class PurpurWorldConfig {