Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
befcf86 SPIGOT-7740: Fix using new map cursor types
0922909 Add EntityDamageEvent.DamageCause#CAMPFIRE

CraftBukkit Changes:
a1d2cd1 SPIGOT-7747: Mob head is not dropped when mob was blown up by a charged creeper
8078294 SPIGOT-7746: Server Crashing when Players Getting into End Portals
8d842e2 SPIGOT-7744: Fix exception for shooting projectiles with flame enchantment
64e0ad1 SPIGOT-7744: Fix crash when shooting arrows in creative mode
819f7a1 Fix player items not dropping on death
0a0229b Implement DamageCause#CAMPFIRE and minor improvement in exception for Unhandled block damage

patches/api/0006-Adventure.patch

@@ -4817,7 +4817,7 @@ index bd512a7840d4686759097ee4cbd8b375c530956b..f2242ddc4085f7e7cdd748d860857822
 +    // Paper end - adventure
  }
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7d74f1467 100644
+index 7736ef1020b658206056af02fdb8c04de2d55541..4e84e3c5d0fa23bbb063d8429c18abcd7ee6b82a 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
 @@ -12,7 +12,7 @@ public final class MapCursor {

patches/api/0171-Fix-Spigot-annotation-mistakes.patch

@@ -1677,7 +1677,7 @@ index edef478786bb7456af29ca960009873095830050..e8ac449e6280827beb6d2699df75b1d5
 
      /**
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index f973f0f3925819765412f6f134e553d7d74f1467..1afa33ca0d900d9301d52ace3ddb0bd50b5ce4e8 100644
+index 4e84e3c5d0fa23bbb063d8429c18abcd7ee6b82a..a17b755da4eca0370680a9777ff3c7de422f5079 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
 @@ -158,9 +158,9 @@ public final class MapCursor {
@@ -1702,8 +1702,8 @@ index f973f0f3925819765412f6f134e553d7d74f1467..1afa33ca0d900d9301d52ace3ddb0bd5
 -    @Deprecated
 +    @Deprecated(forRemoval = true, since = "1.20.2") // Paper
      public void setRawType(byte type) {
-         if (type < 0 || type > 26) {
-             throw new IllegalArgumentException("Type must be in the range 0-26");
+         if (type < 0 || type > 34) {
+             throw new IllegalArgumentException("Type must be in the range 0-34");
 @@ -339,9 +339,9 @@ public final class MapCursor {
           * Gets the internal value of the cursor.
           *

patches/api/0437-add-missing-Experimental-annotations.patch

@@ -81,7 +81,7 @@ index e404cd1e2ba44e4c2d09524bc7cf730d8ffbdabd..cea0ebf50876dd32ab7fba6025b30f29
  public interface BundleMeta extends ItemMeta {
 
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 1afa33ca0d900d9301d52ace3ddb0bd50b5ce4e8..65133e057690eba612520cce6ef9e45312258066 100644
+index a17b755da4eca0370680a9777ff3c7de422f5079..aa3b84ef523cd493b89159ed9d81fc19c2285709 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
 @@ -311,12 +311,25 @@ public final class MapCursor {

patches/api/0479-Allow-to-define-new-map-cursor-types.patch

@@ -5,15 +5,15 @@ Subject: [PATCH] Allow to define new map cursor types
 
 
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
-index 65133e057690eba612520cce6ef9e45312258066..21bc42ea602c7cc4eab5f9ac59a7e539131a2254 100644
+index aa3b84ef523cd493b89159ed9d81fc19c2285709..21bc42ea602c7cc4eab5f9ac59a7e539131a2254 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java
 +++ b/src/main/java/org/bukkit/map/MapCursor.java
 @@ -221,8 +221,8 @@ public final class MapCursor {
       */
      @Deprecated(forRemoval = true, since = "1.20.2") // Paper
      public void setRawType(byte type) {
--        if (type < 0 || type > 26) {
--            throw new IllegalArgumentException("Type must be in the range 0-26");
+-        if (type < 0 || type > 34) {
+-            throw new IllegalArgumentException("Type must be in the range 0-34");
 +        if (type < 0 || type > Type.UPPER_MAP_CURSOR_TYPE_BOUND) { // Paper
 +            throw new IllegalArgumentException("Type must be in the range 0-" + Type.UPPER_MAP_CURSOR_TYPE_BOUND); // Paper
          }

patches/server/0009-MC-Utils.patch

@@ -6932,7 +6932,7 @@ index 9d11fcb3df12182ae00ce73f7e30091fd199a341..eea8bafd98e3a8d82b3216488537ab89
      public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey<Level> resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List<CustomSpawner> list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
          // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e2eb76e8993dd556606b5bb38814fe848fbf01a6..5f8adf662e5ab9114e2891cfacb8db5d4d40a297 100644
+index f6e28e64024549f4562ec4a4ba46a0429d9a9d52..d02e958d74fe4bb97ce36ca04a36bcf7e73de016 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -280,6 +280,8 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0010-Adventure.patch

@@ -2689,7 +2689,7 @@ index b1325e090f2c7aff31d27fc38ca7173efe31ed7c..0742aaf07f37e51d24295e7819ac6cec
 
      public boolean logIPs() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5f8adf662e5ab9114e2891cfacb8db5d4d40a297..a8a7f1fcf235508d9437ec7c550c3a3853321b78 100644
+index d02e958d74fe4bb97ce36ca04a36bcf7e73de016..dc92e1cd0a10ec4e6b4ad6145d5fc0a4ef199365 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -171,6 +171,7 @@ import net.minecraft.world.item.trading.MerchantOffers;
@@ -4616,7 +4616,7 @@ index 5725b0281ac53a2354b233223259d6784353bc6e..9ef939b76d06874b856e0c850addb364
      @Override
      public int getLineWidth() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 02b52e182ce89d20a873076ca3180ff6f68219d3..968c5588659990d1e29252413881cf6dd867b984 100644
+index 889af27e3fe5ce98b68b3177639c338ca287b024..a29dfbe7aa06113358a2078d927fc53662a5f91f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -907,7 +907,7 @@ public class CraftEventFactory {

patches/server/0042-Configurable-end-credits.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a8a7f1fcf235508d9437ec7c550c3a3853321b78..2022667e631d0ae1c7e7ffcfeca81091aa7c57c7 100644
+index dc92e1cd0a10ec4e6b4ad6145d5fc0a4ef199365..9f38010f247694e1014c9c93bfcf46d103d8fd20 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1164,6 +1164,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0049-Implement-PlayerLocaleChangeEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2022667e631d0ae1c7e7ffcfeca81091aa7c57c7..de55fbbc92d180ca49427b134e6fc8e20f52607c 100644
+index 9f38010f247694e1014c9c93bfcf46d103d8fd20..48cb8a211ab45d072c440dbfaa66ff83112d375c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -236,7 +236,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0051-Configurable-container-update-tick-rate.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index de55fbbc92d180ca49427b134e6fc8e20f52607c..916ba7c09b077bc3c9ed9fad579e607e4c065e06 100644
+index 48cb8a211ab45d072c440dbfaa66ff83112d375c..03ad47b96fe8ed37bb855a8bdc1513e7ff67c62d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -267,6 +267,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0072-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 65ad1166d3cc85bfe65170c55fd0b4300efcb9a3..686237a21eccb43ee9f0b659915c141d6ad49f28 100644
+index 5c906d7e611e6148cb68413421490f71ac1fafd8..2783c60dee6ddb3fddfd86b72bdb57552c7a3e45 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -349,7 +349,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -356,7 +356,7 @@ public abstract class AbstractArrow extends Projectile {
 
      protected void tickDespawn() {
          ++this.life;

patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch

@@ -59,10 +59,10 @@ index f9050a1d255780d5131200e8b31bd91154907af6..fc196fc89502b8006dba0f15380d8668
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 968c5588659990d1e29252413881cf6dd867b984..09b6cfd22673d338c5d16162bafeac2ae0b3074a 100644
+index a29dfbe7aa06113358a2078d927fc53662a5f91f..5ea0b9f215dcb457d9e34fe5e3b074843e034b0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1859,4 +1859,13 @@ public class CraftEventFactory {
+@@ -1861,4 +1861,13 @@ public class CraftEventFactory {
 
          Bukkit.getPluginManager().callEvent(new EntityRemoveEvent(entity.getBukkitEntity(), cause));
      }

patches/server/0109-Add-EntityZapEvent.patch

@@ -28,10 +28,10 @@ index 63c10be6eacd7108b8b4795d76bf624e0614440a..243eb1e54293c763a06febff551c0513
                  entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null);
                  entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 09b6cfd22673d338c5d16162bafeac2ae0b3074a..72eb4ddf05e43dd2da6bfdc6987a9218fcf1171a 100644
+index 5ea0b9f215dcb457d9e34fe5e3b074843e034b0f..8071c04be18b67a9f12fb92154c0fd19769972ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1196,6 +1196,14 @@ public class CraftEventFactory {
+@@ -1198,6 +1198,14 @@ public class CraftEventFactory {
          return !event.isCancelled();
      }
 

patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch

@@ -18,10 +18,10 @@ index 56402312e44d12c859e2c4b39902d31b7cfd1573..25a45e680f9fdea90f43d59de87a3a50
 
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 72eb4ddf05e43dd2da6bfdc6987a9218fcf1171a..81fb6a8499f57ed1931bcd562ead20e27bdfa99b 100644
+index 8071c04be18b67a9f12fb92154c0fd19769972ab..ad799d1d0f46663d5bc850763629f430d00b58fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1149,6 +1149,17 @@ public class CraftEventFactory {
+@@ -1151,6 +1151,17 @@ public class CraftEventFactory {
          return event;
      }
 

patches/server/0114-Add-ProjectileCollideEvent.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent
 Deprecated now and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 81fb6a8499f57ed1931bcd562ead20e27bdfa99b..000a95dfd5c83b84fcd973a388a705d9470a4fe0 100644
+index ad799d1d0f46663d5bc850763629f430d00b58fe..a4060019e30f6fc64e10494ed41d6613d1b894d7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1293,6 +1293,17 @@ public class CraftEventFactory {
+@@ -1295,6 +1295,17 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
 
@@ -27,7 +27,7 @@ index 81fb6a8499f57ed1931bcd562ead20e27bdfa99b..000a95dfd5c83b84fcd973a388a705d9
      public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) {
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
-@@ -1317,8 +1328,15 @@ public class CraftEventFactory {
+@@ -1319,8 +1330,15 @@ public class CraftEventFactory {
          if (position.getType() == HitResult.Type.ENTITY) {
              hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
          }

patches/server/0121-Properly-fix-item-duplication-bug.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 916ba7c09b077bc3c9ed9fad579e607e4c065e06..813c3bc9943e2700d2e4ad2335b7d235d21610fa 100644
+index 03ad47b96fe8ed37bb855a8bdc1513e7ff67c62d..7b09fc5d9039d792d3cfdf8152c947ba6842b87b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2624,7 +2624,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0123-PlayerTeleportEndGatewayEvent.patch

@@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event
 Fix the offset used for player teleportation
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 813c3bc9943e2700d2e4ad2335b7d235d21610fa..a2d35f7066d89f861c1b75ec8a62f03ed6f65dd8 100644
+index 7b09fc5d9039d792d3cfdf8152c947ba6842b87b..5cb79e38ce7b28e7575b8a8a92786415ee6a4dec 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1195,11 +1195,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0132-provide-a-configurable-option-to-disable-creeper-lin.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index c7ca5af731e0b92a511b90cba2047b1ed7d4e144..92384c2da9a15a781794e16176349eb39d012696 100644
+index 918051756c9adf8c01ddbbc5298269419d7f23ba..57e758616b0a82113168a3bd9f46efd353707a11 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -287,7 +287,7 @@ public class Creeper extends Monster implements PowerableMob {

patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch

@@ -60,7 +60,7 @@ index c0808b6026b94676c1c6457e4bb44dcbc5e2a55b..6e941ca68c2ca9d7753358f738704c4d
                  boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
                  Iterator iterator1 = list.iterator();
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a2d35f7066d89f861c1b75ec8a62f03ed6f65dd8..71eca7032aa2482bde7a2a00163f5547f3487b5e 100644
+index 5cb79e38ce7b28e7575b8a8a92786415ee6a4dec..ebedd613fa243c2caa4c3783b2bd3a7ad9c6644f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -286,6 +286,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {

patches/server/0193-WitchReadyPotionEvent.patch

@@ -22,10 +22,10 @@ index a14e00d55930628333cc63b18727ea56dbdc4ee3..f6d01d21745391595d61b191832be4c2
                      this.setUsingItem(true);
                      if (!this.isSilent()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 000a95dfd5c83b84fcd973a388a705d9470a4fe0..4e0db83bb6a4529b6e0727ea181bf79e06c2025a 100644
+index a4060019e30f6fc64e10494ed41d6613d1b894d7..587437f995dd411c051f2125202f1a48cfc1bb1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1905,4 +1905,14 @@ public class CraftEventFactory {
+@@ -1907,4 +1907,14 @@ public class CraftEventFactory {
          ).callEvent();
      }
      // Paper end - PlayerUseUnknownEntityEvent

patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 92384c2da9a15a781794e16176349eb39d012696..6b57500b2265be637c8d21807867341202305d59 100644
+index 57e758616b0a82113168a3bd9f46efd353707a11..36505d8c66f63191574b5a79b8ee15071587a931 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -278,6 +278,7 @@ public class Creeper extends Monster implements PowerableMob {

patches/server/0203-Add-entity-knockback-events.patch

@@ -224,10 +224,10 @@ index d20389c6d73114810ab8dc20a02b09db4f1971f1..d4077e88910347fb332996ce88262a1a
                                      // CraftBukkit end
                                      Level world = this.level();
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index 686237a21eccb43ee9f0b659915c141d6ad49f28..a2617881999ea61bf132ff75fb36e783261e5835 100644
+index 2783c60dee6ddb3fddfd86b72bdb57552c7a3e45..1e2d4af56ed7b3fece353b3031a965ff5798f4c5 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-@@ -512,7 +512,7 @@ public abstract class AbstractArrow extends Projectile {
+@@ -519,7 +519,7 @@ public abstract class AbstractArrow extends Projectile {
              Vec3 vec3d = this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(d0 * 0.6D * d1);
 
              if (vec3d.lengthSqr() > 0.0D) {
@@ -272,10 +272,10 @@ index d93ed33d5ae72e9dd3e6cf044ef79e4b9689dc1c..512d79b66fed3d1bef645c3ecb59bda0
                          // CraftBukkit end
                          entity.setDeltaMovement(entity.getDeltaMovement().add(vec3d1));
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4e0db83bb6a4529b6e0727ea181bf79e06c2025a..d625fd361c94c89749a6f41d9783f3864ed5e027 100644
+index 587437f995dd411c051f2125202f1a48cfc1bb1b..86bddb9c39d8487f050d126dbb479315cb8a2818 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1867,19 +1867,33 @@ public class CraftEventFactory {
+@@ -1869,19 +1869,33 @@ public class CraftEventFactory {
          return event;
      }