aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0006-Adventure.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2024-06-14 10:15:52 -0700
committerSpottedleaf <[email protected]>2024-06-14 10:15:52 -0700
commit38b3182a9062e88959b33b486fbd73ac179f80c0 (patch)
tree7d6fcfdc84fc70dc76cf4ad5f84a7e9cf83827b2 /patches/api/0006-Adventure.patch
parent66f7b672ed6c60d9aee49f6dd174126714f4a151 (diff)
downloadPaper-38b3182a9062e88959b33b486fbd73ac179f80c0.tar.gz
Paper-38b3182a9062e88959b33b486fbd73ac179f80c0.zip
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: befcf86d SPIGOT-7740: Fix using new map cursor types 09229095 Add EntityDamageEvent.DamageCause#CAMPFIRE CraftBukkit Changes: a1d2cd152 SPIGOT-7747: Mob head is not dropped when mob was blown up by a charged creeper 8078294bc SPIGOT-7746: Server Crashing when Players Getting into End Portals 8d842e250 SPIGOT-7744: Fix exception for shooting projectiles with flame enchantment 64e0ad129 SPIGOT-7744: Fix crash when shooting arrows in creative mode 819f7a10a Fix player items not dropping on death 0a0229bb5 Implement DamageCause#CAMPFIRE and minor improvement in exception for Unhandled block damage
Diffstat (limited to 'patches/api/0006-Adventure.patch')
-rw-r--r--patches/api/0006-Adventure.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
index d82022467e..c9e666738c 100644
--- a/patches/api/0006-Adventure.patch
+++ b/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 {