Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a7ae966 readd itemstack data sanitization (#10454)
PaperMC/Paper@ca50b87 Clear firework item properly (#10793)
PaperMC/Paper@9774a52 fix and cleanup loot table patches (#10100)
PaperMC/Paper@ac4ee06 Fix integer overflow for lag compensating eating check (#10797)
PaperMC/Paper@6649a17 Fix BlockStateMeta equals (#10795)
PaperMC/Paper@1b8cdc6 Extend Player Interact cancellation to cover Jigsaw blocks (#10719)
PaperMC/Paper@841ab41 Fix more item desync when an event is cancelled (#10654)
PaperMC/Paper@b0e3ca4 Prevent NPE if hooked entity was cleared (#10712)
PaperMC/Paper@347bbe3 Fix Cancelling BlockPlaceEvent calling onRemove (#10773)
This commit is contained in:
granny
2024-05-26 17:12:40 -07:00
parent 22fc5f9bda
commit 2842b97ddf
38 changed files with 160 additions and 160 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2f16b454fb72dc3fce129b6326ba41eb2fcb6861..324be0ae784cd7ae80ef6e2352010f1b08c55eaf 100644
index afb96312f3c88a298799bd487e048d3d84252bf6..126a11c27deb848c86e81ae6e63610c5bb711956 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3458,7 +3458,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3457,7 +3457,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public int getMaxAirSupply() {
@@ -18,7 +18,7 @@ index 2f16b454fb72dc3fce129b6326ba41eb2fcb6861..324be0ae784cd7ae80ef6e2352010f1b
public int getAirSupply() {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index eb7405f67d8812d2e1b8f629914ca319517614cb..4bc9a3ff5bb6959de2e6a5721f9889902ab88fe2 100644
index 828d42cac52fb7f1f0ca50b46e5f15492c8c8707..70d8e252371a29832580e7e0b230f9b7534a9720 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -452,7 +452,7 @@ public abstract class LivingEntity extends Entity implements Attackable {