Don't duplicate velocity entry into hidden-configs

also, rebuild patches
This commit is contained in:
Shane Freeder
2020-03-31 05:21:27 +01:00
parent 28cf6540c6
commit 9b3679fbd3
4 changed files with 18 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
From d20ece1f23e5a10ab447b9b23b433ce5d4989084 Mon Sep 17 00:00:00 2001
From 3a31b47397ded83cb461dbdad9e81ab444e5bd0e Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@@ -161,7 +161,7 @@ index 27ce4a828e..30bafb214b 100644
public static Timing getTickList(WorldServer worldserver, String timingsType) {
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 8d1e871dd2..93ac863332 100644
index 4735d30253..5093c56f4e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -1,5 +1,6 @@
@@ -171,7 +171,7 @@ index 8d1e871dd2..93ac863332 100644
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
@@ -365,4 +366,64 @@ public class PaperConfig {
@@ -367,4 +368,64 @@ public class PaperConfig {
maxBookPageSize = getInt("settings.book-size.page-max", maxBookPageSize);
maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
}