aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1010-Improve-boat-collision-performance.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1010-Improve-boat-collision-performance.patch')
-rw-r--r--patches/server/1010-Improve-boat-collision-performance.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/patches/server/1010-Improve-boat-collision-performance.patch b/patches/server/1010-Improve-boat-collision-performance.patch
new file mode 100644
index 0000000000..2754015b1c
--- /dev/null
+++ b/patches/server/1010-Improve-boat-collision-performance.patch
@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Mon, 2 Aug 2021 10:10:40 +0200
+Subject: [PATCH] Improve boat collision performance
+
+
+diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java
+index edf937591abf62416bd692e40b7b7a6badbe877d..b40864e41e1506884fdefefbf3cf4833a8f706c3 100644
+--- a/src/main/java/net/minecraft/Util.java
++++ b/src/main/java/net/minecraft/Util.java
+@@ -121,6 +121,7 @@ public class Util {
+ }).findFirst().orElseThrow(() -> {
+ return new IllegalStateException("No jar file system provider found");
+ });
++ public static final double COLLISION_EPSILON = 1.0E-7; // Paper - Improve boat collision performance
+ private static Consumer<String> thePauser = (message) -> {
+ };
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 6b58292469b5507e0e000455146a7ee1852571c5..5cedbe57f15024e6b1c278de1b3cf3e1fd84de06 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -1446,7 +1446,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ if (!source.is(DamageTypeTags.IS_PROJECTILE)) {
+ Entity entity = source.getDirectEntity();
+
+- if (entity instanceof LivingEntity) {
++ if (entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Improve boat collision performance
+ LivingEntity entityliving = (LivingEntity) entity;
+
+ this.blockUsingShield(entityliving);
+@@ -1540,11 +1540,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ }
+
+ if (entity1 != null && !source.is(DamageTypeTags.NO_KNOCKBACK)) {
+- double d0 = entity1.getX() - this.getX();
++ final boolean far = entity1.distanceToSqr(this) > (200.0 * 200.0); // Paper - Improve boat collision performance
++ double d0 = far ? (Math.random() - Math.random()) : entity1.getX() - this.getX(); // Paper - Improve boat collision performance
+
+ double d1;
+
+- for (d1 = entity1.getZ() - this.getZ(); d0 * d0 + d1 * d1 < 1.0E-4D; d1 = (Math.random() - Math.random()) * 0.01D) {
++ for (d1 = far ? Math.random() - Math.random() : entity1.getZ() - this.getZ(); d0 * d0 + d1 * d1 < 1.0E-4D; d1 = (Math.random() - Math.random()) * 0.01D) { // Paper - Improve boat collision performance
+ d0 = (Math.random() - Math.random()) * 0.01D;
+ }
+
+@@ -2287,7 +2288,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+ this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
+ Entity entity = damagesource.getDirectEntity();
+
+- if (entity instanceof LivingEntity) {
++ if (entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Improve boat collision performance
+ this.blockUsingShield((LivingEntity) entity);
+ }
+ }
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+index 1ced6d60a74fac028804b3c2d938e89af4706823..db6aa75d642f4a7258f197933671907faf79c8f2 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
+@@ -689,7 +689,7 @@ public class Boat extends VehicleEntity implements VariantHolder<Boat.Type> {
+ this.invFriction = 0.05F;
+ if (this.oldStatus == Boat.Status.IN_AIR && this.status != Boat.Status.IN_AIR && this.status != Boat.Status.ON_LAND) {
+ this.waterLevel = this.getY(1.0D);
+- this.setPos(this.getX(), (double) (this.getWaterLevelAbove() - this.getBbHeight()) + 0.101D, this.getZ());
++ this.move(MoverType.SELF, new Vec3(0.0, ((double) (this.getWaterLevelAbove() - this.getBbHeight()) + 0.101D) - this.getY(), 0.0)); // Paper - Improve boat collision performance
+ this.setDeltaMovement(this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D));
+ this.lastYd = 0.0D;
+ this.status = Boat.Status.IN_WATER;