aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch')
-rw-r--r--patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch
new file mode 100644
index 0000000000..51d947382e
--- /dev/null
+++ b/patches/server/0760-Prevent-excessive-velocity-through-repeated-crits.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <[email protected]>
+Date: Thu, 25 Nov 2021 10:25:09 +0100
+Subject: [PATCH] Prevent excessive velocity through repeated crits
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 76ef3f561e3f8e0c0f9732feb64aacca93b57431..8ac7d25e6e1a22829d6c45522409763bbb1328a0 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -2648,14 +2648,27 @@ public abstract class LivingEntity extends Entity {
+ return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
+ }
+
++ protected long lastJumpTime = 0L; // Paper
+ protected void jumpFromGround() {
+ double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
+ Vec3 vec3d = this.getDeltaMovement();
++ // Paper start
++ long time = System.nanoTime();
++ boolean canCrit = true;
++ if (this instanceof net.minecraft.world.entity.player.Player) {
++ canCrit = false;
++ if (time - this.lastJumpTime > (long)(0.250e9)) {
++ this.lastJumpTime = time;
++ canCrit = true;
++ }
++ }
++ // Paper end
+
+ this.setDeltaMovement(vec3d.x, d0, vec3d.z);
+ if (this.isSprinting()) {
+ float f = this.getYRot() * 0.017453292F;
+
++ if (canCrit) // Paper
+ this.setDeltaMovement(this.getDeltaMovement().add((double) (-Mth.sin(f) * 0.2F), 0.0D, (double) (Mth.cos(f) * 0.2F)));
+ }
+