Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207)
PaperMC/Paper@a058ac0 Dolphin API (#7102)
PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334)
PaperMC/Paper@7978121 More PotionEffectType API (#5737)
PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400)
This commit is contained in:
BillyGalbreath
2022-01-23 18:04:09 -06:00
parent 746e8f9caf
commit cb7bcb9686
29 changed files with 98 additions and 105 deletions

View File

@@ -172,7 +172,7 @@ index 55bae3efbc630be6d40d415509de4c3e744a5004..9d649923e28f4839106b336fce41bd3f
.withRequiredArg()
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..720233b1dce48d23c5852765c8614ee86dc14695
index 0000000000000000000000000000000000000000..96802b86828522006d4a25ab61e6630173688679
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -0,0 +1,170 @@
@@ -250,8 +250,8 @@ index 0000000000000000000000000000000000000000..720233b1dce48d23c5852765c8614ee8
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 25);
+ set("config-version", 25);
+ version = getInt("config-version", 26);
+ set("config-version", 26);
+
+ readConfig(PurpurConfig.class, null);
+ }