testserver/patches/server/0214-Implement-EntityKnockb...

93 lines
6.3 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Mon, 18 Jun 2018 15:46:23 +0200
Subject: [PATCH] Implement EntityKnockbackByEntityEvent
This event is called when an entity receives knockback by another entity.
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
2021-06-16 04:53:50 +00:00
index 08c29388621bf460e1704f6edba59d08a12e75d0..7bb2ce6b378547d593f8487626b5a4d4b3361397 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
2021-06-12 19:30:37 +00:00
@@ -1437,7 +1437,7 @@ public abstract class LivingEntity extends Entity {
2021-06-11 12:02:28 +00:00
}
2021-06-12 19:30:37 +00:00
this.hurtDir = (float) (Mth.atan2(d1, d0) * 57.2957763671875D - (double) this.getYRot());
- this.knockback(0.4000000059604645D, d0, d1);
+ this.knockback(0.4000000059604645D, d0, d1, entity1);
2021-06-11 12:02:28 +00:00
} else {
this.hurtDir = (float) ((int) (Math.random() * 2.0D) * 180);
}
2021-06-12 19:30:37 +00:00
@@ -1485,7 +1485,7 @@ public abstract class LivingEntity extends Entity {
2021-06-11 12:02:28 +00:00
}
protected void blockedByShield(LivingEntity target) {
2021-06-12 19:30:37 +00:00
- target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ());
+ target.knockback(0.5D, target.getX() - this.getX(), target.getZ() - this.getZ(), this);
2021-06-11 12:02:28 +00:00
}
private boolean checkTotemDeathProtection(DamageSource source) {
2021-06-12 19:30:37 +00:00
@@ -1733,6 +1733,11 @@ public abstract class LivingEntity extends Entity {
2021-06-11 12:02:28 +00:00
}
2021-06-12 19:30:37 +00:00
public void knockback(double strength, double x, double z) {
2021-06-11 12:02:28 +00:00
+ // Paper start - add knockbacking entity parameter
2021-06-12 19:30:37 +00:00
+ this.knockback(strength, x, z, null);
2021-06-11 12:02:28 +00:00
+ }
2021-06-12 19:30:37 +00:00
+ public void knockback(double strength, double x, double z, Entity knockingBackEntity) {
2021-06-11 12:02:28 +00:00
+ // Paper end - add knockbacking entity parameter
2021-06-12 19:30:37 +00:00
strength *= 1.0D - this.getAttributeValue(Attributes.KNOCKBACK_RESISTANCE);
if (strength > 0.0D) {
2021-06-11 12:02:28 +00:00
this.hasImpulse = true;
2021-06-12 19:30:37 +00:00
@@ -1740,6 +1745,15 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = (new Vec3(x, 0.0D, z)).normalize().scale(strength);
2021-06-11 12:02:28 +00:00
2021-06-12 19:30:37 +00:00
this.setDeltaMovement(vec3d.x / 2.0D - vec3d1.x, this.onGround ? Math.min(0.4D, vec3d.y / 2.0D + strength) : vec3d.y, vec3d.z / 2.0D - vec3d1.z);
2021-06-11 12:02:28 +00:00
+ // Paper start - call EntityKnockbackByEntityEvent
2021-06-12 19:30:37 +00:00
+ Vec3 currentMovement = this.getDeltaMovement();
+ org.bukkit.util.Vector delta = new org.bukkit.util.Vector(currentMovement.x - vec3d.x, currentMovement.y - vec3d.y, currentMovement.z - vec3d.z);
2021-06-11 12:02:28 +00:00
+ // Restore old velocity to be able to access it in the event
+ this.setDeltaMovement(vec3d);
2021-06-12 19:30:37 +00:00
+ if (knockingBackEntity == null || new com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent((org.bukkit.entity.LivingEntity) getBukkitEntity(), knockingBackEntity.getBukkitEntity(), (float) strength, delta).callEvent()) {
2021-06-11 12:02:28 +00:00
+ this.setDeltaMovement(vec3d.x + delta.getX(), vec3d.y + delta.getY(), vec3d.z + delta.getZ());
+ }
+ // Paper end
}
}
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 85633cd1718783cffe03f750da1c17270eeb4cdd..5595150b0da580fce4d5d23993d77314e225ad58 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
2021-06-12 19:30:37 +00:00
@@ -1532,7 +1532,7 @@ public abstract class Mob extends LivingEntity {
2021-06-11 12:02:28 +00:00
if (flag) {
if (f1 > 0.0F && target instanceof LivingEntity) {
2021-06-12 19:30:37 +00:00
- ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
+ ((LivingEntity) target).knockback((double) (f1 * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
2021-06-11 12:02:28 +00:00
this.setDeltaMovement(this.getDeltaMovement().multiply(0.6D, 1.0D, 0.6D));
}
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
2021-06-16 04:53:50 +00:00
index 543a1c9bc5aa97262424758c69cb28127fa0ee75..022bff6ac8ed5f2da438929c5ac455505bb16da7 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
2021-06-12 19:30:37 +00:00
@@ -1234,7 +1234,7 @@ public abstract class Player extends LivingEntity {
2021-06-11 12:02:28 +00:00
if (flag5) {
if (i > 0) {
if (target instanceof LivingEntity) {
2021-06-12 19:30:37 +00:00
- ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
+ ((LivingEntity) target).knockback((double) ((float) i * 0.5F), (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
2021-06-11 12:02:28 +00:00
} else {
2021-06-12 19:30:37 +00:00
target.push((double) (-Mth.sin(this.getYRot() * 0.017453292F) * (float) i * 0.5F), 0.1D, (double) (Mth.cos(this.getYRot() * 0.017453292F) * (float) i * 0.5F));
2021-06-11 12:02:28 +00:00
}
2021-06-12 19:30:37 +00:00
@@ -1258,7 +1258,7 @@ public abstract class Player extends LivingEntity {
2021-06-11 12:02:28 +00:00
if (entityliving != this && entityliving != target && !this.isAlliedTo(entityliving) && (!(entityliving instanceof ArmorStand) || !((ArmorStand) entityliving).isMarker()) && this.distanceToSqr((Entity) entityliving) < 9.0D) {
// CraftBukkit start - Only apply knockback if the damage hits
if (entityliving.hurt(DamageSource.playerAttack(this).sweep(), f4)) {
2021-06-12 19:30:37 +00:00
- entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)));
+ entityliving.knockback(0.4000000059604645D, (double) Mth.sin(this.getYRot() * 0.017453292F), (double) (-Mth.cos(this.getYRot() * 0.017453292F)), this); // Paper
2021-06-11 12:02:28 +00:00
}
// CraftBukkit end
}