aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-04-27 14:35:53 -0700
committerGitHub <[email protected]>2024-04-27 14:35:53 -0700
commita7719407767f230b93aab08b92b8efe8ded8354d (patch)
tree9c7376f78168ee88c4c575cac676184caea6ee45 /patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
parent53d8edd75687d365a7707ff0cd8ad71226358d57 (diff)
downloadPaper-a7719407767f230b93aab08b92b8efe8ded8354d.tar.gz
Paper-a7719407767f230b93aab08b92b8efe8ded8354d.zip
Revert to vanilla handling of LivingEntity#actuallyHurt (#10463)
Diffstat (limited to 'patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch')
-rw-r--r--patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
index 96a98989cc..dfc2aa7485 100644
--- a/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0931-Fix-several-issues-with-EntityBreedEvent.patch
@@ -69,7 +69,7 @@ index 0440fd2d1bb3f87641ad88de6d5ae64617536a6d..db60b91c2b26ca8cdb66e05deab7742f
if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
return InteractionResult.PASS;
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-index 33531cbdd9b2a5607092d2364ce5655a63c2361c..9229948c90e278cbdacd0f82689144c8dc50956f 100644
+index 8ebe18a1abbac81094e6aab19ba76edc0255e3b7..4eb26874f21726bbc6e6ad78bfaf4ecd268c7246 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -389,7 +389,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl