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

@@ -86,7 +86,7 @@ index e3f1f20608cab7067674b2cdd2759a34902b6626..cef8e9b379c4205386d1001e86abc7dc
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..cd3272520eb78a9c663bac3bfdb2b63d611d48a1
index 0000000000000000000000000000000000000000..19541e7071c05dce30c384093c8eae5beff3e515
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -145,8 +145,8 @@ index 0000000000000000000000000000000000000000..cd3272520eb78a9c663bac3bfdb2b63d
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 10);
+ set("config-version", 10);
+ version = getInt("config-version", 11);
+ set("config-version", 11);
+
+ readConfig(PurpurConfig.class, null);
+ }