f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
--- a/net/minecraft/world/entity/Interaction.java
|
|
+++ b/net/minecraft/world/entity/Interaction.java
|
|
@@ -100,9 +_,16 @@
|
|
@Override
|
|
public boolean skipAttackInteraction(Entity entity) {
|
|
if (entity instanceof Player player) {
|
|
+ // CraftBukkit start
|
|
+ DamageSource source = player.damageSources().generic().eventEntityDamager(entity);
|
|
+ org.bukkit.event.entity.EntityDamageEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNonLivingEntityDamageEvent(this, source, 1.0F, false);
|
|
+ if (event.isCancelled()) {
|
|
+ return true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.attack = new Interaction.PlayerAction(player.getUUID(), this.level().getGameTime());
|
|
if (player instanceof ServerPlayer serverPlayer) {
|
|
- CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(serverPlayer, this, player.damageSources().generic(), 1.0F, 1.0F, false);
|
|
+ CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(serverPlayer, this, source, 1.0F, (float) event.getFinalDamage(), false); // CraftBukkit
|
|
}
|
|
|
|
return !this.getResponse();
|