45 lines
2.6 KiB
Diff
45 lines
2.6 KiB
Diff
--- a/net/minecraft/world/entity/Interaction.java
|
|
+++ b/net/minecraft/world/entity/Interaction.java
|
|
@@ -21,6 +21,12 @@
|
|
import net.minecraft.world.phys.AxisAlignedBB;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.world.damagesource.DamageSource;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.EntityDamageEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class Interaction extends Entity implements Attackable, Targeting {
|
|
|
|
private static final DataWatcherObject<Float> DATA_WIDTH_ID = DataWatcher.<Float>defineId(Interaction.class, DataWatcherRegistry.FLOAT);
|
|
@@ -55,8 +61,8 @@
|
|
protected void readAdditionalSaveData(NBTTagCompound nbttagcompound) {
|
|
this.setWidth(nbttagcompound.getFloatOr("width", 1.0F));
|
|
this.setHeight(nbttagcompound.getFloatOr("height", 1.0F));
|
|
- this.attack = (Interaction.PlayerAction) nbttagcompound.read("attack", Interaction.PlayerAction.CODEC).orElse((Object) null);
|
|
- this.interaction = (Interaction.PlayerAction) nbttagcompound.read("interaction", Interaction.PlayerAction.CODEC).orElse((Object) null);
|
|
+ this.attack = (Interaction.PlayerAction) nbttagcompound.read("attack", Interaction.PlayerAction.CODEC).orElse(null); // CraftBukkit - decompile error
|
|
+ this.interaction = (Interaction.PlayerAction) nbttagcompound.read("interaction", Interaction.PlayerAction.CODEC).orElse(null); // CraftBukkit - decompile error
|
|
this.setResponse(nbttagcompound.getBooleanOr("response", false));
|
|
this.setBoundingBox(this.makeBoundingBox());
|
|
}
|
|
@@ -102,9 +108,16 @@
|
|
@Override
|
|
public boolean skipAttackInteraction(Entity entity) {
|
|
if (entity instanceof EntityHuman entityhuman) {
|
|
+ // CraftBukkit start
|
|
+ DamageSource source = entityhuman.damageSources().playerAttack(entityhuman);
|
|
+ EntityDamageEvent event = CraftEventFactory.callNonLivingEntityDamageEvent(this, source, 1.0F, false);
|
|
+ if (event.isCancelled()) {
|
|
+ return true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.attack = new Interaction.PlayerAction(entityhuman.getUUID(), this.level().getGameTime());
|
|
if (entityhuman instanceof EntityPlayer entityplayer) {
|
|
- CriterionTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, entityhuman.damageSources().generic(), 1.0F, 1.0F, false);
|
|
+ CriterionTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, source, (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit
|
|
}
|
|
|
|
return !this.getResponse();
|