Remap CraftBukkit to Mojang+Yarn Mappings

By: Initial Source <noreply+automated@papermc.io>
This commit is contained in:
CraftBukkit/Spigot
2024-12-11 22:26:55 +01:00
parent a265d64138
commit 30e4583dbe
1780 changed files with 44628 additions and 41274 deletions

View File

@@ -0,0 +1,20 @@
--- a/net/minecraft/world/effect/HealOrHarmMobEffect.java
+++ b/net/minecraft/world/effect/HealOrHarmMobEffect.java
@@ -17,7 +17,7 @@
@Override
public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
if (this.isHarm == entity.isInvertedHealAndHarm()) {
- entity.heal((float) Math.max(4 << amplifier, 0));
+ entity.heal((float) Math.max(4 << amplifier, 0), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC); // CraftBukkit
} else {
entity.hurtServer(world, entity.damageSources().magic(), (float) (6 << amplifier));
}
@@ -31,7 +31,7 @@
if (this.isHarm == target.isInvertedHealAndHarm()) {
j = (int) (proximity * (double) (4 << amplifier) + 0.5D);
- target.heal((float) j);
+ target.heal((float) j, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC); // CraftBukkit
} else {
j = (int) (proximity * (double) (6 << amplifier) + 0.5D);
if (effectEntity == null) {