mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Correctly cancel consumption of consumable

Browse source 
See: #11534
This commit is contained in:
Bjarne Koll 2024-10-31 12:44:02 +01:00 • committed by GitHub
parent 40a960db45
commit dfedf79a2f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 125 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
patches/server/1032-Void-damage-configuration-API.patch
View file

@ -20,7 +20,7 @@ index ddfc4818f091802e5999c6b99e5bc57c6f370648..e5466be840ef32e4fa17c0e9446c4d0b
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
// Paper end - Configurable nether ceiling damage
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3cc0b820363e748bca7f8770239b38f3845dd6a6..a7a2306433014f45e2a448ebe125b668cc49b3d1 100644
index 4d75ce205d5a0d61780936aa522710f5f753b271..22bb0aaf3aebdc60a8894dc473cbeb0e58ca37b8 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2700,7 +2700,7 @@ public abstract class LivingEntity extends Entity implements Attackable {