diff options
| author | Spottedleaf <[email protected]> | 2024-06-14 10:15:52 -0700 |
|---|---|---|
| committer | Spottedleaf <[email protected]> | 2024-06-14 10:15:52 -0700 |
| commit | 38b3182a9062e88959b33b486fbd73ac179f80c0 (patch) | |
| tree | 7d6fcfdc84fc70dc76cf4ad5f84a7e9cf83827b2 /patches/server/0209-InventoryCloseEvent-Reason-API.patch | |
| parent | 66f7b672ed6c60d9aee49f6dd174126714f4a151 (diff) | |
| download | Paper-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/server/0209-InventoryCloseEvent-Reason-API.patch')
| -rw-r--r-- | patches/server/0209-InventoryCloseEvent-Reason-API.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0209-InventoryCloseEvent-Reason-API.patch b/patches/server/0209-InventoryCloseEvent-Reason-API.patch index 838f24a751..8972b2bb78 100644 --- a/patches/server/0209-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0209-InventoryCloseEvent-Reason-API.patch @@ -29,7 +29,7 @@ index 5bf18ab5c397b32d880ea1827f62945d8d0e80ce..ce6be7aed7b392c3e0c851f3f6e1e216 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 71eca7032aa2482bde7a2a00163f5547f3487b5e..2758f4fc1c230c0029ece90718057a7b111909f0 100644 +index ebedd613fa243c2caa4c3783b2bd3a7ad9c6644f..16f7278ce8d5b8c45026baeb017fdce1ed5945c8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -707,7 +707,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -178,10 +178,10 @@ index 27298cd0558b1ff2ab2ca341d62da2922507414b..38bc1747d2010b9233c64de81eb1c042 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d625fd361c94c89749a6f41d9783f3864ed5e027..23d57911616de1df1442d26ec31a187a5f70ed11 100644 +index 86bddb9c39d8487f050d126dbb479315cb8a2818..8d86649579cb7eb90e3866ed81f2ba4f342f8b1c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1262,7 +1262,7 @@ public class CraftEventFactory { +@@ -1264,7 +1264,7 @@ public class CraftEventFactory { public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) { if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open @@ -190,7 +190,7 @@ index d625fd361c94c89749a6f41d9783f3864ed5e027..23d57911616de1df1442d26ec31a187a } CraftServer server = player.level().getCraftServer(); -@@ -1449,8 +1449,18 @@ public class CraftEventFactory { +@@ -1451,8 +1451,18 @@ public class CraftEventFactory { return event; } |