Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)

This commit is contained in:
Jason 2021-10-04 22:14:11 -05:00 committed by GitHub
parent 90f717fa5a
commit a3dfe6dca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
365 changed files with 725 additions and 732 deletions

View file

@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
Don't even get me started
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index dcf12a35a5a4e0682db81c58ad115687ad5ae7cc..a5e47e581a79546e10ad2f5bdabcd92607384867 100644
index 407292123b29fbc558b6b826878bf739fba05436..f6761a4bfa7a73cdbd1ecd4be1f9e78f61a67ae3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1230,10 +1230,16 @@ public abstract class LivingEntity extends Entity {