From c2c4cf44b69bd61e556d56f81bcdb7ba68185db1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Jul 2020 19:47:11 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit/Spigot)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
2f1810812 Improve physics code

Spigot Changes:
c3a49df2 Rebuild patches
---
 ...-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch | 4 ++--
 .../0481-No-Tick-view-distance-implementation.patch       | 8 ++++----
 work/CraftBukkit                                          | 2 +-
 work/Spigot                                               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index cabdba7ec5..246a617c5f 100644
--- a/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/Spigot-Server-Patches/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -44,12 +44,12 @@ index 991baec71cfeb79ee2108870645a19582f151def..a2954709415751d9688b5b3597f5b15a
              this.methodProfiler.a(() -> {
                  return worldserver + " " + worldserver.getDimensionKey().a();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1e72dd313e1fe0f701f3d14fffdc9a6a8db78934..948e477e112cd1e27c74a29c6330b07f9b710ffe 100644
+index 8308c1dbff44226f93715670ce03504f53f6fdb7..b6102d501616bc536a7dc14ec2917e1461b3ea19 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -441,7 +441,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  // CraftBukkit start
-                 iblockdata1.b(this, blockposition, j); // Don't call an event for the old block to limit event spam
+                 iblockdata1.b(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam
                  CraftWorld world = ((WorldServer) this).getWorld();
 -                if (world != null) {
 +                if (world != null && ((WorldServer)this).hasPhysicsEvent) { // Paper
diff --git a/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
index 61869bc2a9..328841ee74 100644
--- a/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0481-No-Tick-view-distance-implementation.patch
@@ -115,7 +115,7 @@ index 7e57a53ec614a2f7d2672edff9d7c0e0dca42377..c072f61e8c88eac8335acd660d8ff0e2
                  if (flag1) {
                      ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2b7e7a7aaa56b9c51fa0c8065ff25828d92c09ee..5f9ab1b81c1440d9b3003fbbf7d00b135a6b811e 100644
+index 70dda78684c1dc620fec5e4132a4b013bcaff37e..6e0882e7e396f76b451e11c6cc6959e813de0a1f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -115,6 +115,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -598,7 +598,7 @@ index 3d110c998f6b28e55055637bbfeff6f2ebdb2747..59f00891ee2d1641678d4903a365cb94
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 365539e53efdb7e729b580f52fb23659cbde4f0a..ba50189b10b54f5b35448c898f8c3495ddf8e112 100644
+index 24047e02c0232217be6ced5708daef754d74e280..302b0eda863dcaf7eeea7b0e1820929a46f44c54 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -508,8 +508,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -615,9 +615,9 @@ index 365539e53efdb7e729b580f52fb23659cbde4f0a..ba50189b10b54f5b35448c898f8c3495
 +                // Paper end - per player view distance
              }
  
-             if (!this.isClientSide && (i & 1) != 0) {
+             if ((i & 1) != 0) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3ec021746ffaea89f09126538fcaa0555872ac17..11559f9e4b3f5fda6bfe4f70f963ce4f7967f051 100644
+index b8bbc99d5d11cff21955f4b98f8673c6ad3580b7..b34269cd29fe15408e8811a8ab88b8d0fa43fcd3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2530,10 +2530,39 @@ public class CraftWorld implements World {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 7a9e4f7aeb..2f18108123 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 7a9e4f7aebbdb9c119aa82b2c7988c982d02b13a
+Subproject commit 2f18108123a33312a073906cd2a5fe2da18dc049
diff --git a/work/Spigot b/work/Spigot
index 8918ad0f3e..c3a49df215 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 8918ad0f3ef4002d099b2465dc0d6bbb20891e5a
+Subproject commit c3a49df215f30328bf56f08227072c79944760ed