Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
6859765e4 Add PlayerShearBlockEvent
a665c2ec0 added missing default perms
4f19b170d Add summary to /paper chunkinfo command

current-paper

@@ -1 +1 @@
-1.16.4--e855e246b1a208750c8b7d8a17c30436fb454bc7
+1.16.4--3f4e68ea602867f288fc86aaa72e3ffc93b51644

patches/server/0023-Silk-touch-spawners.patch

@@ -4,20 +4,8 @@ Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners
 
 
-diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 4b4f14711d..372ee6adce 100644
---- a/src/main/java/net/minecraft/server/Block.java
-+++ b/src/main/java/net/minecraft/server/Block.java
-@@ -223,6 +223,7 @@ public class Block extends BlockBase implements IMaterial {
- 
-     }
- 
-+    public static void dropItem(World world, BlockPosition blockposition, ItemStack itemstack) { a(world, blockposition, itemstack); } // Purpur - OBFHELPER
-     public static void a(World world, BlockPosition blockposition, ItemStack itemstack) {
-         if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
-             float f = 0.5F;
 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
-index 81e145ff07..91b92d95a9 100644
+index 81e145ff0..91b92d95a 100644
 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
 +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
 @@ -1,5 +1,14 @@
@@ -105,7 +93,7 @@ index 81e145ff07..91b92d95a9 100644
          return i;
 diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
 new file mode 100644
-index 0000000000..5c7f739185
+index 000000000..5c7f73918
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemSpawner.java
 @@ -0,0 +1,23 @@
@@ -133,7 +121,7 @@ index 0000000000..5c7f739185
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
-index 1c861bccc2..67ebcbe4da 100644
+index 1c861bccc..67ebcbe4d 100644
 --- a/src/main/java/net/minecraft/server/Items.java
 +++ b/src/main/java/net/minecraft/server/Items.java
 @@ -180,7 +180,7 @@ public class Items {
@@ -146,7 +134,7 @@ index 1c861bccc2..67ebcbe4da 100644
      public static final Item cy = a(Blocks.CHEST, CreativeModeTab.c);
      public static final Item cz = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c7fb5a737c..ba89efb315 100644
+index c7fb5a737..ba89efb31 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,6 +1,12 @@

patches/server/0126-Persistent-TileEntity-Lore-and-DisplayName.patch

@@ -7,26 +7,31 @@ Makes it so that when a TileEntity is placed in the world and then broken,
 the dropped ItemStack retains any original custom display name/lore.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 4aa2b38f18..f863909992 100644
+index d621b11ba..c276a2896 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
-@@ -207,6 +207,7 @@ public class Block extends BlockBase implements IMaterial {
+@@ -207,7 +207,7 @@ public class Block extends BlockBase implements IMaterial {
      public static void a(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition, @Nullable TileEntity tileentity) {
          if (generatoraccess instanceof WorldServer) {
              a(iblockdata, (WorldServer) generatoraccess, blockposition, tileentity).forEach((itemstack) -> {
-+                itemstack = applyDisplayNameAndLoreFromTile(itemstack, tileentity); // Purpur
+-                a((World) ((WorldServer) generatoraccess), blockposition, itemstack);
-                 a((World) ((WorldServer) generatoraccess), blockposition, itemstack);
++                dropItem((WorldServer) generatoraccess, blockposition, applyDisplayNameAndLoreFromTile(itemstack, tileentity)); // Purpur
              });
              iblockdata.dropNaturally((WorldServer) generatoraccess, blockposition, ItemStack.b);
-@@ -217,6 +218,7 @@ public class Block extends BlockBase implements IMaterial {
+         }
+@@ -216,14 +216,56 @@ public class Block extends BlockBase implements IMaterial {
+ 
      public static void dropItems(IBlockData iblockdata, World world, BlockPosition blockposition, @Nullable TileEntity tileentity, Entity entity, ItemStack itemstack) {
          if (world instanceof WorldServer) {
-             getDrops(iblockdata, (WorldServer) world, blockposition, tileentity, entity, itemstack).forEach((itemstack1) -> {
+-            getDrops(iblockdata, (WorldServer) world, blockposition, tileentity, entity, itemstack).forEach((itemstack1) -> {
-+                itemstack1 = applyDisplayNameAndLoreFromTile(itemstack1, tileentity); // Purpur
+-                a(world, blockposition, itemstack1);
-                 a(world, blockposition, itemstack1);
++            // Purpur start
++            getDrops(iblockdata, (WorldServer) world, blockposition, tileentity, entity, itemstack).forEach(stackToDrop -> {
++                dropItem(world, blockposition, applyDisplayNameAndLoreFromTile(stackToDrop, tileentity));
++                // Purpur end
              });
              iblockdata.dropNaturally((WorldServer) world, blockposition, itemstack);
-@@ -224,6 +226,46 @@ public class Block extends BlockBase implements IMaterial {
+         }
  
      }
  
@@ -70,11 +75,11 @@ index 4aa2b38f18..f863909992 100644
 +    }
 +    // Purpur end
 +
-     public static void dropItem(World world, BlockPosition blockposition, ItemStack itemstack) { a(world, blockposition, itemstack); } // Purpur - OBFHELPER
+     public static void a(World world, BlockPosition blockposition, ItemStack itemstack) { dropItem(world, blockposition, itemstack); } public static void dropItem(World world, BlockPosition blockposition, ItemStack itemstack) { // Paper - OBFHELPER
-     public static void a(World world, BlockPosition blockposition, ItemStack itemstack) {
          if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
+             float f = 0.5F;
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index bbb1de7d1a..d97efe3d47 100644
+index bbb1de7d1..d97efe3d4 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -96,7 +96,24 @@ public class ItemBlock extends Item {
@@ -104,7 +109,7 @@ index bbb1de7d1a..d97efe3d47 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 58d958a88a..8e87490954 100644
+index 58d958a88..8e8749095 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -90,9 +90,25 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -160,7 +165,7 @@ index 58d958a88a..8e87490954 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b7e43839ae..7f3d25b5a2 100644
+index b7e43839a..7f3d25b5a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -182,6 +182,7 @@ public class PurpurWorldConfig {