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

@@ -20,7 +20,7 @@ index 6685bf1757458d908e32d4069f7a8a22a28c28d7..82d663d3b8bbbb020c3467ea93b54729
itemstack.setCount(1);
entityitem = entityplayer.drop(itemstack, false);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b43d6d08d1eb2d77a4c8288d5c5f2a76efcab8db..3836602aba80a1e23bbec451d6948159b10dd24d 100644
index 08780b09a163311a3eaae4dd89dd8dab2eba310e..a8d2df5ba1d6400dc3431f7aaf148a0691007e9c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -193,6 +193,11 @@ public class PurpurConfig {