[ci-skip] rebuild

patches/Tuinity/patches/server/0002-Brand-changes.patch

@@ -40,10 +40,10 @@ index a0f53c9eff04a40780b3ba568dbfc5bbe9bd8504..3bc5cd1e53dd7c94b948e7f57f0dc8e0
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0db00322ebf600245bf9311e547c8c743a60a173..e3253796c70b990e000ed1073f4070fe07a3f845 100644
+index 61712ae515b329a6b85dbe2e5960e4e864dc7731..5acae1e8e0324723e567674f6df3d0ac1d0ca68c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1569,7 +1569,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1579,7 +1579,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
 
      public String getServerModName() {

patches/Tuinity/patches/server/0004-Util-patch.patch

@@ -2034,7 +2034,7 @@ index 1d72af9cace7aa8f1d20c7c1c5be621f533e2dad..006e7076932f6be576a64da09c4d84ca
      public static <T> void mergeSortedSets(final java.util.function.Consumer<T> consumer, final java.util.Comparator<? super T> comparator, final java.util.SortedSet<T>...sets) {
          final ObjectRBTreeSet<T> all = new ObjectRBTreeSet<>(comparator);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e3253796c70b990e000ed1073f4070fe07a3f845..dda93749eef9cd63e47ffe269b839512fe4db695 100644
+index 5acae1e8e0324723e567674f6df3d0ac1d0ca68c..cc06164291f454e074c3955f63df758990b6075e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -267,6 +267,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -2045,15 +2045,15 @@ index e3253796c70b990e000ed1073f4070fe07a3f845..dda93749eef9cd63e47ffe269b839512
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public boolean serverAutoSave = false; // Paper
-@@ -1088,6 +1089,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1098,6 +1099,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          this.lastOverloadTime = this.nextTick;
                      }
 
 +                    ++MinecraftServer.currentTickLong; // Tuinity
                      if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
                      {
                          final long diff = curTime - tickSection;
-@@ -1474,6 +1476,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1484,6 +1486,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  midTickLoadChunks(); // Paper
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.doTick(booleansupplier);
@@ -2422,7 +2422,7 @@ index 300884804bf9ac3fba7c30a04d8adf52e3dd2e3e..f3d6811156e68040106f1d027a10ea33
 
      // Paper start - async io
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index ef9b08df58d9d28df6b8ade076d95bf7e5cb1b18..f88b80e4772ade4199564cf96ef94ce45e493311 100644
+index 47fbb8df04b2b77e10314666e87eaef621cffb3b..6055bcc3b593cbcb5863e337ba650f125b89be29 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -168,6 +168,7 @@ import org.bukkit.event.server.MapInitializeEvent;

patches/Tuinity/patches/server/0005-Tuinity-Server-Config.patch

@@ -1,11 +1,11 @@
-From 01714d58684fb0fdc502c6ca310a633759625e66 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 3 Mar 2019 18:25:06 -0800
 Subject: [PATCH] Tuinity Server Config
 
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index e33e889c2..5dfa06588 100644
+index e33e889c291d37a821a4fbd40d9aac7bb079de0d..5dfa0658838c4801cdf260eae8b98163f729e5af 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -229,7 +229,8 @@ public class TimingsExport extends Thread {
@@ -20,7 +20,7 @@ index e33e889c2..5dfa06588 100644
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 new file mode 100644
-index 000000000..0f66484a8
+index 0000000000000000000000000000000000000000..0f66484a80d3cc7caaf8a111bd50229e673bd8e0
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -0,0 +1,236 @@
@@ -262,7 +262,7 @@ index 000000000..0f66484a8
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc0616429..61830a9c9 100644
+index cc06164291f454e074c3955f63df758990b6075e..61830a9c953e35b5c429be18da4331806294ffa5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1082,6 +1082,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -274,7 +274,7 @@ index cc0616429..61830a9c9 100644
                  org.spigotmc.WatchdogThread.hasStarted = true; // Paper
                  Arrays.fill( recentTps, 20 );
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index df8270c40..327b5ee35 100644
+index df8270c40ed7ce6f628686ff6f4fa4cf96af6738..327b5ee357a24ad5d47b5a06458e6fb517fea625 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -215,6 +215,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -286,7 +286,7 @@ index df8270c40..327b5ee35 100644
          this.setPVP(dedicatedserverproperties.pvp);
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
-index 6581fe0d9..32b6de119 100644
+index 6581fe0d93a5c2e7b444a44c01726e02d4a28e63..32b6de119c1ee27be0be42c0a0cdb4dd741a4c36 100644
 --- a/src/main/java/net/minecraft/world/level/World.java
 +++ b/src/main/java/net/minecraft/world/level/World.java
 @@ -154,6 +154,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -307,7 +307,7 @@ index 6581fe0d9..32b6de119 100644
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d3c235693..08783d678 100644
+index d3c235693094170767cbd12d0e009ce1c6c4b125..08783d678bd9729c144a6de2718253bd20ff398c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -864,6 +864,7 @@ public final class CraftServer implements Server {
@@ -342,7 +342,7 @@ index d3c235693..08783d678 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index ad9dd0f45..145748b5c 100644
+index ad9dd0f4518b1b6b1d84f5deaf1029de103100da..145748b5ca095cd555fd1f085a596bf0f58fea13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -140,6 +140,13 @@ public class Main {
@@ -359,6 +359,3 @@ index ad9dd0f45..145748b5c 100644
 
                  // Paper start
                  acceptsAll(asList("server-name"), "Name of the server")
--- 
-2.31.1
-

patches/Tuinity/patches/server/0008-Add-soft-async-catcher.patch

@@ -120,7 +120,7 @@ index 033548a58d27f64d3954206d267783c0437d4019..08ed243259f052165c6f75aed1d1d65a
 
      public TickThread(final Runnable run, final String name, final int id) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
-index 2f8bca35508640f6b8c312fff17d55f129431599..aac3f74af760e8d7dbb1e9d4031ce1aabe45ca21 100644
+index 3644e8b24b082e17752ef52934625416130aaa08..4dfc1101d5fc78630ef8b816e8f84f5541683f0b 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
 @@ -74,6 +74,7 @@ public abstract class ChunkMapDistance {
@@ -256,7 +256,7 @@ index f3d6811156e68040106f1d027a10ea33b5646b05..e7cd6392d722d0e13b86b57d70946b18
 
          this.noTickViewDistance = viewDistance;
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index f88b80e4772ade4199564cf96ef94ce45e493311..c485837c751fb8bf7c30dbca955321f586940a8b 100644
+index 6055bcc3b593cbcb5863e337ba650f125b89be29..3e30663eecc8af3df835cd1864b2d6c5f5262fb4 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1775,6 +1775,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

patches/Tuinity/patches/server/0009-Delay-chunk-unloads.patch

@@ -19,7 +19,7 @@ affects player loaded chunks, when we want to target all
 loads.
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index f10fa659680f8a574f77d260bbc52be349c244e8..dea6aabc0c145b0723badf7024a9f8a0b241f24c 100644
+index f10fa659680f8a574f77d260bbc52be349c244e8..182f419fde8eb3646a79cc0ba689ee486cb53338 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -1,6 +1,7 @@
@@ -30,11 +30,10 @@ index f10fa659680f8a574f77d260bbc52be349c244e8..dea6aabc0c145b0723badf7024a9f8a0
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.ConfigurationSection;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -122,6 +123,15 @@ public final class TuinityConfig {
-         tickWorldsInParallel = TuinityConfig.getBoolean("tick-worlds-in-parallel", false);
+@@ -123,6 +124,15 @@ public final class TuinityConfig {
          tickThreads = TuinityConfig.getInt("server-tick-threads", 1); // will be 4 in the future
      }*/
-+    
+
 +    public static int delayChunkUnloadsBy;
 +
 +    private static void delayChunkUnloadsBy() {
@@ -43,11 +42,12 @@ index f10fa659680f8a574f77d260bbc52be349c244e8..dea6aabc0c145b0723badf7024a9f8a0
 +            TicketType.DELAYED_UNLOAD.loadPeriod = delayChunkUnloadsBy;
 +        }
 +    }
- 
++
      public static final class WorldConfig {
 
+         public final String worldName;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
-index aac3f74af760e8d7dbb1e9d4031ce1aabe45ca21..8d4944fa1c761bb3ab299ec639663e7f52b512a3 100644
+index 4dfc1101d5fc78630ef8b816e8f84f5541683f0b..c474ee61d98772a2852c44dec1c4a1037472ed2c 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMapDistance.java
 @@ -40,7 +40,7 @@ public abstract class ChunkMapDistance {
@@ -247,7 +247,7 @@ index 3c804c7b20a14ea6e510810e2be10c1cc89ff5c1..47da7efffde2e6d63c1a064b950abf81
          return new TicketType<>(s, comparator, 0L);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 62513d3acb930c4c9fa3d875a1fc94bb4d948951..69b776b0a7e254a84fcf50784cde30629488a2d9 100644
+index 3b3eda95c0ff8b129adedbae6561bba2d01c2f3a..03f74fb19e93620e057e71ac0c6c368e81aa532e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -505,6 +505,7 @@ public class CraftWorld implements World {

patches/Tuinity/patches/server/0011-Lag-compensate-block-breaking.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Lag compensate block breaking
 Use time instead of ticks if ticks fall behind
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index dea6aabc0c145b0723badf7024a9f8a0b241f24c..6edc8765df8644426613c40557d890620060fab1 100644
+index 182f419fde8eb3646a79cc0ba689ee486cb53338..5aa558bd05c4ab735730263f220478c36a4ba0fd 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -133,6 +133,12 @@ public final class TuinityConfig {
@@ -23,10 +23,10 @@ index dea6aabc0c145b0723badf7024a9f8a0b241f24c..6edc8765df8644426613c40557d89062
 
          public final String worldName;
 diff --git a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eeaded246bc 100644
+index 87722285690d9d3370610e2a2eb809e0d1f497c9..1746a8c1750b494c47f9f46e83b248d8129d2630 100644
 --- a/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/level/PlayerInteractManager.java
-@@ -55,14 +55,29 @@ public class PlayerInteractManager {
+@@ -56,14 +56,29 @@ public class PlayerInteractManager {
      private EnumGamemode gamemode;
      private EnumGamemode e;
      private boolean f;
@@ -59,7 +59,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
      public PlayerInteractManager(WorldServer worldserver) {
          this.gamemode = EnumGamemode.NOT_SET;
          this.e = EnumGamemode.NOT_SET;
-@@ -118,7 +133,7 @@ public class PlayerInteractManager {
+@@ -119,7 +134,7 @@ public class PlayerInteractManager {
              if (iblockdata == null || iblockdata.isAir()) { // Paper
                  this.j = false;
              } else {
@@ -68,7 +68,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
 
                  if (f >= 1.0F) {
                      this.j = false;
-@@ -138,7 +153,7 @@ public class PlayerInteractManager {
+@@ -139,7 +154,7 @@ public class PlayerInteractManager {
                  this.m = -1;
                  this.f = false;
              } else {
@@ -77,7 +77,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
              }
          }
 
-@@ -146,6 +161,12 @@ public class PlayerInteractManager {
+@@ -147,6 +162,12 @@ public class PlayerInteractManager {
 
      private float a(IBlockData iblockdata, BlockPosition blockposition, int i) {
          int j = this.currentTick - i;
@@ -90,7 +90,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
          float f = iblockdata.getDamage(this.player, this.player.world, blockposition) * (float) (j + 1);
          int k = (int) (f * 10.0F);
 
-@@ -213,7 +234,7 @@ public class PlayerInteractManager {
+@@ -214,7 +235,7 @@ public class PlayerInteractManager {
                      return;
                  }
 
@@ -99,7 +99,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
                  float f = 1.0F;
 
                  iblockdata = this.world.getType(blockposition);
-@@ -266,12 +287,12 @@ public class PlayerInteractManager {
+@@ -267,12 +288,12 @@ public class PlayerInteractManager {
                      int j = (int) (f * 10.0F);
 
                      this.world.a(this.player.getId(), blockposition, j);
@@ -114,7 +114,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
 
                      iblockdata = this.world.getType(blockposition);
                      if (!iblockdata.isAir()) {
-@@ -288,12 +309,18 @@ public class PlayerInteractManager {
+@@ -289,12 +310,18 @@ public class PlayerInteractManager {
                              this.f = false;
                              this.j = true;
                              this.k = blockposition;
@@ -134,7 +134,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
              } else if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.ABORT_DESTROY_BLOCK) {
                  this.f = false;
                  if (!Objects.equals(this.h, blockposition) && !BlockPosition.ZERO.equals(this.h)) {
-@@ -305,7 +332,7 @@ public class PlayerInteractManager {
+@@ -306,7 +333,7 @@ public class PlayerInteractManager {
                  }
 
                  this.world.a(this.player.getId(), blockposition, -1);
@@ -143,7 +143,7 @@ index 1511cf54fea53577a2808b5d84417eee834db984..e47a743fd3adc62aa47beec722f49eea
              }
 
          }
-@@ -315,7 +342,13 @@ public class PlayerInteractManager {
+@@ -316,7 +343,13 @@ public class PlayerInteractManager {
 
      public void a(BlockPosition blockposition, PacketPlayInBlockDig.EnumPlayerDigType packetplayinblockdig_enumplayerdigtype, String s) {
          if (this.breakBlock(blockposition)) {

patches/Tuinity/patches/server/0013-Per-World-Spawn-Limits.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Per World Spawn Limits
 This patch is licensed under the MIT license. See /licenses/MIT.md.
 
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
-index 6edc8765df8644426613c40557d890620060fab1..fdc56a5080ab2f7331431ee1f5976ba669b725ac 100644
+index 5aa558bd05c4ab735730263f220478c36a4ba0fd..6473b951788a3ecbeee4811ea0288ff47b48355f 100644
 --- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -269,6 +269,23 @@ public final class TuinityConfig {
@@ -35,7 +35,7 @@ index 6edc8765df8644426613c40557d890620060fab1..fdc56a5080ab2f7331431ee1f5976ba6
  }
 \ No newline at end of file
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 69b776b0a7e254a84fcf50784cde30629488a2d9..4356d30353cc856c53731e9f10885d74a62027d2 100644
+index 03f74fb19e93620e057e71ac0c6c368e81aa532e..c89b4788cec45354e03efc3f9b05dd3891101349 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -342,6 +342,14 @@ public class CraftWorld implements World {

patches/Tuinity/patches/server/0014-Detail-more-information-in-watchdog-dumps.patch

@@ -74,7 +74,7 @@ index 67d8fe8ad036a9252c774bb6a914c8ec79981876..71a000edfab27c9965d1929af7858282
              });
              throw CancelledPacketHandleException.INSTANCE;
 diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index c485837c751fb8bf7c30dbca955321f586940a8b..25073eb392bb00daf7e0b68be4767cea416c1816 100644
+index 3e30663eecc8af3df835cd1864b2d6c5f5262fb4..979f2ddf4fb1b0b0a740a02a4084292a37b76c68 100644
 --- a/src/main/java/net/minecraft/server/level/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/level/WorldServer.java
 @@ -1015,7 +1015,26 @@ public class WorldServer extends World implements GeneratorAccessSeed {