Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9205b75c Updated Upstream (CraftBukkit)
c32f8e13 PlayerDeathEvent#shouldDropExperience
05ecc314 Updated Upstream (CraftBukkit)
f8fd607e Updated Upstream (Bukkit/CraftBukkit/Spigot)

current-paper

@@ -1 +1 @@
-1.15.1--fa05334178501d099a80430f8a4d24a784514075
+1.15.1--2af1239f36ca98bae87f65d3acea99e99b4351a5

patches/server/0020-Allow-color-codes-on-signs.patch

@@ -1,4 +1,4 @@
-From 34ee8eddbefe3923f22ec3021a0bedaa88af15b6 Mon Sep 17 00:00:00 2001
+From 40062ba2309e8947ee3217bd3257bdf3cd1e24cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Allow color codes on signs
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs
  4 files changed, 28 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 30380c8db4..4ad6b48c25 100644
+index 5cd709991..32ad1543b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1090,6 +1090,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1091,6 +1091,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index 30380c8db4..4ad6b48c25 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c559a7b95d..925824c349 100644
+index a1ce2d2e0..213f7992d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2575,6 +2575,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index c559a7b95d..925824c349 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 5eb86c4341..8810a1120b 100644
+index 5eb86c434..8810a1120 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -119,6 +119,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 5eb86c4341..8810a1120b 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8bd887b1c2..abd10a500a 100644
+index 8bd887b1c..abd10a500 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -98,4 +98,9 @@ public class PurpurWorldConfig {
@@ -81,5 +81,5 @@ index 8bd887b1c2..abd10a500a 100644
 +    }
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch

@@ -1,4 +1,4 @@
-From 8274817a5714b4cf69bd350bb538be96e3b18d8f Mon Sep 17 00:00:00 2001
+From 261892e5199193eed4f87e8c0c2411a7d0698d1e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -9,10 +9,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
  2 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3739a95c5a..79fa88549a 100644
+index 70cbff313..0a9df816c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -531,12 +531,18 @@ public class WorldServer extends World {
+@@ -540,12 +540,18 @@ public class WorldServer extends World {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {
@@ -38,7 +38,7 @@ index 3739a95c5a..79fa88549a 100644
  
                  this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 882f7711c7..f0ed3c9749 100644
+index 511429677..3389d626a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -207,6 +207,11 @@ public class PurpurConfig {
@@ -54,5 +54,5 @@ index 882f7711c7..f0ed3c9749 100644
      private static void largeEnderChests() {
          largeEnderChests = getBoolean("settings.large-ender-chests", largeEnderChests);
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0039-Players-should-not-cram-to-death.patch

@@ -1,4 +1,4 @@
-From 9cf29811f1f450baf81e489fc07542d0440d8deb Mon Sep 17 00:00:00 2001
+From 0835235b0f6fa6d2b7ac2b602477a93fbeeea26c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4ad6b48c25..563bf54f8b 100644
+index 32ad1543b..4cb276eef 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1064,7 +1064,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1065,7 +1065,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
@@ -21,5 +21,5 @@ index 4ad6b48c25..563bf54f8b 100644
  
      @Override
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0050-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 023247dcf9fc86239935f562c73ffe2891d9a250 Mon Sep 17 00:00:00 2001
+From a063e7d8e839dc8b34deaf97db791706528b6010 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -17,7 +17,7 @@ Subject: [PATCH] Implement AFK API
  10 files changed, 113 insertions(+), 24 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index dee92e5a72..5e99ad8144 100644
+index dee92e5a7..5e99ad814 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1374,6 +1374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,7 +29,7 @@ index dee92e5a72..5e99ad8144 100644
          double d3 = this.locX() - d0;
          double d4 = this.locY() - d1;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 886fbb7dff..2ec3e660b3 100644
+index e9d1c01ed..f405f0169 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -49,10 +49,10 @@ index 886fbb7dff..2ec3e660b3 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 08f3a390eb..6de306628c 100644
+index 4cb276eef..e1ed67f41 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1581,8 +1581,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1582,8 +1582,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.cj = SystemUtils.getMonotonicMillis();
@@ -105,7 +105,7 @@ index 08f3a390eb..6de306628c 100644
          return this.serverStatisticManager;
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 8b36252ae1..5e2d56d5de 100644
+index 8b36252ae..5e2d56d5d 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -116,28 +116,18 @@ public interface IEntityAccess {
@@ -150,7 +150,7 @@ index 8b36252ae1..5e2d56d5de 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 8d7273a38b..71c61dc45e 100644
+index 8d7273a38..71c61dc45 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -170,7 +170,7 @@ index 8d7273a38b..71c61dc45e 100644
      public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
          double d4 = d3 * d3;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a4af019bc6..2db59c55ca 100644
+index a4af019bc..2db59c55c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -277,6 +277,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,19 +205,19 @@ index a4af019bc6..2db59c55ca 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 79fa88549a..78754c254e 100644
+index 0a9df816c..84c069330 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -366,7 +366,7 @@ public class WorldServer extends World {
+@@ -367,7 +367,7 @@ public class WorldServer extends World {
          }
  
          if (this.C && this.players.stream().noneMatch((entityplayer) -> {
 -            return !entityplayer.isSpectator() && !entityplayer.isDeeplySleeping() && !entityplayer.fauxSleeping; // CraftBukkit
 +            return !entityplayer.isSpectator() && !entityplayer.isDeeplySleeping() && !entityplayer.fauxSleeping && !(purpurConfig.idleTimeoutCountAsSleeping && entityplayer.isAfk()); // CraftBukkit // Purpur
          })) {
-             this.C = false;
-             if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
-@@ -639,7 +639,7 @@ public class WorldServer extends World {
+             // CraftBukkit start
+             long l = this.worldData.getDayTime() + 24000L;
+@@ -648,7 +648,7 @@ public class WorldServer extends World {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
@@ -227,7 +227,7 @@ index 79fa88549a..78754c254e 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 059cf85f4f..0764be9d1a 100644
+index 059cf85f4..0764be9d1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,6 +1,7 @@
@@ -261,7 +261,7 @@ index 059cf85f4f..0764be9d1a 100644
      public double elytraDamageMultiplyBySpeed = 0;
      public boolean elytraIgnoreUnbreaking = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 712056cad1..c12d52e5df 100644
+index 712056cad..c12d52e5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2063,4 +2063,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -287,7 +287,7 @@ index 712056cad1..c12d52e5df 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 92601c581c..185717c804 100644
+index 92601c581..185717c80 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -128,6 +128,7 @@ public class ActivationRange
@@ -299,5 +299,5 @@ index 92601c581c..185717c804 100644
              ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
              ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0067-Add-block-and-fluid-tick-events.patch

@@ -1,4 +1,4 @@
-From f5244669db2e3f7e914008169a3ac0173380ebf5 Mon Sep 17 00:00:00 2001
+From 464fb34e27bf195e29a5a33cca4d05e739862e6e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 23:58:56 -0500
 Subject: [PATCH] Add block and fluid tick events
@@ -10,10 +10,10 @@ Subject: [PATCH] Add block and fluid tick events
  3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 78754c254e..266173096f 100644
+index 84c069330..8ae7b7784 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -586,7 +586,7 @@ public class WorldServer extends World {
+@@ -595,7 +595,7 @@ public class WorldServer extends World {
                          gameprofilerfiller.enter("randomTick");
                          IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
  
@@ -22,7 +22,7 @@ index 78754c254e..266173096f 100644
                              iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
                              iblockdata.b(this, blockposition2, this.random);
                              iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
-@@ -594,7 +594,7 @@ public class WorldServer extends World {
+@@ -603,7 +603,7 @@ public class WorldServer extends World {
  
                          Fluid fluid = iblockdata.getFluid();
  
@@ -31,7 +31,7 @@ index 78754c254e..266173096f 100644
                              fluid.b(this, blockposition2, this.random);
                          }
  
-@@ -683,6 +683,7 @@ public class WorldServer extends World {
+@@ -692,6 +692,7 @@ public class WorldServer extends World {
          Fluid fluid = this.getFluid(nextticklistentry.a);
  
          if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 78754c254e..266173096f 100644
              fluid.a((World) this, nextticklistentry.a);
          }
  
-@@ -692,6 +693,7 @@ public class WorldServer extends World {
+@@ -701,6 +702,7 @@ public class WorldServer extends World {
          IBlockData iblockdata = this.getType(nextticklistentry.a);
  
          if (iblockdata.getBlock() == nextticklistentry.b()) {
@@ -48,7 +48,7 @@ index 78754c254e..266173096f 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f687444604..3ad3415c4a 100644
+index f68744460..3ad3415c4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -62,6 +62,13 @@ public class PurpurWorldConfig {
@@ -66,10 +66,10 @@ index f687444604..3ad3415c4a 100644
      private void editableSigns() {
          editableSigns = getBoolean("editable-signs", editableSigns);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a974391025..05389f5bbe 100644
+index 87395de25..be37281d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2384,6 +2384,24 @@ public class CraftWorld implements World {
+@@ -2392,6 +2392,24 @@ public class CraftWorld implements World {
          return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
      }
  
@@ -95,5 +95,5 @@ index a974391025..05389f5bbe 100644
      @Override
      public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0069-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From 478fa240814a1fe4f68df47ab07c1a8fc1e9c525 Mon Sep 17 00:00:00 2001
+From 4b57bf6cf59f6995211ea71b7993a6a2f8e492ef Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:43 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 5 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 05389f5bbe..60405821b6 100644
+index be37281d5..128a18f71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2400,6 +2400,11 @@ public class CraftWorld implements World {
+@@ -2408,6 +2408,11 @@ public class CraftWorld implements World {
      public void setFluidTickEventEnabled(boolean enabled) {
          getHandle().purpurConfig.fluidTickEvent = enabled;
      }
@@ -24,5 +24,5 @@ index 05389f5bbe..60405821b6 100644
  
      // Paper start
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch

@@ -1,4 +1,4 @@
-From 4528776ef7ec55a158fba1eef7fa05f5ddbdf582 Mon Sep 17 00:00:00 2001
+From b047f60737999b2a998432710fda57e575456288 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f72a6ca88..6aa1ad033 100644
+index c5cd19afa..d918a1c7f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1399,8 +1399,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1406,8 +1406,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return blockposition;
      }
  
@@ -25,10 +25,10 @@ index f72a6ca88..6aa1ad033 100644
  
      public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ea8ae7d71..8d96d9b44 100644
+index 128a18f71..b1d980623 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -380,12 +380,16 @@ public class CraftWorld implements World {
+@@ -381,12 +381,16 @@ public class CraftWorld implements World {
      @Override
      public boolean setSpawnLocation(int x, int y, int z) {
          try {
@@ -50,5 +50,5 @@ index ea8ae7d71..8d96d9b44 100644
              return true;
          } catch (Exception e) {
 -- 
-2.24.0.rc1
+2.24.0