aboutsummaryrefslogtreecommitdiffhomepage
path: root/paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch')
-rw-r--r--paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch68
1 files changed, 0 insertions, 68 deletions
diff --git a/paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch b/paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch
deleted file mode 100644
index 39272633a7..0000000000
--- a/paper-server/patches/features/0014-Check-distance-in-entity-interactions.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <[email protected]>
-Date: Mon, 2 Aug 2021 10:10:40 +0200
-Subject: [PATCH] Check distance in entity interactions
-
-
-diff --git a/net/minecraft/Util.java b/net/minecraft/Util.java
-index ae1d53cefb9cede1c93cb8b22122a4a2d2d9a40c..80a7a85e1a03a1ca406259207e1ae3b909b3284f 100644
---- a/net/minecraft/Util.java
-+++ b/net/minecraft/Util.java
-@@ -130,6 +130,7 @@ public class Util {
- .findFirst()
- .orElseThrow(() -> new IllegalStateException("No jar file system provider found"));
- private static Consumer<String> thePauser = string -> {};
-+ public static final double COLLISION_EPSILON = 1.0E-7; // Paper - Check distance in entity interactions
-
- public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> toMap() {
- return Collectors.toMap(Entry::getKey, Entry::getValue);
-diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 9bf5addb07f40cc50e80a46c0ee7944e938620fb..635e6e49483194c43b0ab47b5e1bacfe84613c3a 100644
---- a/net/minecraft/world/entity/LivingEntity.java
-+++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -1385,7 +1385,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- this.hurtCurrentlyUsedShield(amount);
- f1 = amount;
- amount = 0.0F;
-- if (!damageSource.is(DamageTypeTags.IS_PROJECTILE) && damageSource.getDirectEntity() instanceof LivingEntity livingEntity) {
-+ if (!damageSource.is(DamageTypeTags.IS_PROJECTILE) && damageSource.getDirectEntity() instanceof LivingEntity livingEntity && livingEntity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Check distance in entity interactions
- this.blockUsingShield(livingEntity);
- }
-
-@@ -1470,6 +1470,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
- d = damageSource.getSourcePosition().x() - this.getX();
- d1 = damageSource.getSourcePosition().z() - this.getZ();
- }
-+ // Paper start - Check distance in entity interactions; see for loop in knockback method
-+ if (Math.abs(d) > 200) {
-+ d = Math.random() - Math.random();
-+ }
-+ if (Math.abs(d1) > 200) {
-+ d1 = Math.random() - Math.random();
-+ }
-+ // Paper end - Check distance in entity interactions
-
- this.knockback(0.4F, d, d1, damageSource.getDirectEntity(), damageSource.getDirectEntity() == null ? io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.DAMAGE : io.papermc.paper.event.entity.EntityKnockbackEvent.Cause.ENTITY_ATTACK); // CraftBukkit // Paper - knockback events
- if (!flag) {
-@@ -2342,7 +2350,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
- Entity entity = damageSource.getDirectEntity();
-
-- if (!damageSource.is(DamageTypeTags.IS_PROJECTILE) && entity instanceof LivingEntity) { // Paper - Fix shield disable inconsistency
-+ if (!damageSource.is(DamageTypeTags.IS_PROJECTILE) && entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Fix shield disable inconsistency & Check distance in entity interactions
- this.blockUsingShield((LivingEntity) entity);
- }
- }
-diff --git a/net/minecraft/world/entity/vehicle/AbstractBoat.java b/net/minecraft/world/entity/vehicle/AbstractBoat.java
-index 3bdb3b0984d0fee21b2c094e1d4c1f917ab68f92..54a4bf2f7df87b4a694187ade81ba158f83f0246 100644
---- a/net/minecraft/world/entity/vehicle/AbstractBoat.java
-+++ b/net/minecraft/world/entity/vehicle/AbstractBoat.java
-@@ -638,7 +638,7 @@ public abstract class AbstractBoat extends VehicleEntity implements Leashable {
- this.waterLevel = this.getY(1.0);
- double d2 = this.getWaterLevelAbove() - this.getBbHeight() + 0.101;
- if (this.level().noCollision(this, this.getBoundingBox().move(0.0, d2 - this.getY(), 0.0))) {
-- this.setPos(this.getX(), d2, this.getZ());
-+ this.move(MoverType.SELF, new Vec3(0.0D, d2 - this.getY(), 0.0D)); // Paper - Check distance in entity interactions // TODO Still needed??
- this.setDeltaMovement(this.getDeltaMovement().multiply(1.0, 0.0, 1.0));
- this.lastYd = 0.0;
- }