From 8adc57fb3454874ac14b138ba1e0900411fda045 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 7 Jul 2020 09:37:58 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
29453f1d Fix bug on y bitset extraction from 1.16 update
97cedaa5 Optimize the advancement data player iteration to be O(N) rather than O(N^2)
c2c4cf44 [Auto] Updated Upstream (CraftBukkit/Spigot)
e588fd94 Fix Concurrency issue in WeightedList
409b4774 Fix Explosion location - Fixes #3574 (#3826)
---
 Paper                                            | 2 +-
 current-paper                                    | 2 +-
 patches/server/0001-Tuinity-Server-Changes.patch | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Paper b/Paper
index edfa517d5..29453f1db 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit edfa517d5dfa6b3f90c77b261da5ea7bbcbb10bb
+Subproject commit 29453f1dbeb10812aad3280d0c2b7883084426a0
diff --git a/current-paper b/current-paper
index 86b9f4b29..3e68c6f95 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.1--80870c6d6570a0eb47ecd86fac2db5ed8cc1c5e6
+1.16.1--7b7e5e36d11d6efb4beb8d1d5c04e44b8a3d6796
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 2f11a2527..bd9213036 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -5734,7 +5734,7 @@ index 1fa7061f7a..f6f3bdc61d 100644
              throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException());
          } else if (voxelshape == voxelshape1) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b598c48692..8df4ef4881 100644
+index 5f81997db7..4a956f3681 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -5806,7 +5806,7 @@ index b598c48692..8df4ef4881 100644
 @@ -504,6 +532,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      // CraftBukkit start - Split off from above in order to directly send client and physic updates
-     public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i) {
+     public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i, int j) {
 +        com.tuinity.tuinity.util.TickThread.softEnsureTickThread("Async notify and update"); // Tuinity
          IBlockData iblockdata = newBlock;
          IBlockData iblockdata1 = oldBlock;
@@ -6704,7 +6704,7 @@ index d8103ab0d5..ba42171096 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 724c0816d8..21bd9f14e1 100644
+index 65b36a1741..b12da9e3b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -336,6 +336,13 @@ public class CraftWorld implements World {