2021-11-25 10:19:05 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2022-08-01 16:01:20 +02:00
|
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
2021-11-25 10:19:05 +01:00
|
|
|
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
|
2023-07-04 10:22:56 +02:00
|
|
|
index 9f4e33bbd8d86707d50c280d1b9fc0f8538f7700..6220a17852b51f45756d576af662460a28099abc 100644
|
2021-11-25 10:19:05 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2023-07-04 10:22:56 +02:00
|
|
|
@@ -2648,13 +2648,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2023-06-08 09:20:03 +02:00
|
|
|
return this.hasEffect(MobEffects.JUMP) ? 0.1F * ((float) this.getEffect(MobEffects.JUMP).getAmplifier() + 1.0F) : 0.0F;
|
2021-11-25 10:19:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
+ protected long lastJumpTime = 0L; // Paper
|
|
|
|
protected void jumpFromGround() {
|
|
|
|
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
|
|
|
|
|
2023-06-08 09:20:03 +02:00
|
|
|
this.setDeltaMovement(vec3d.x, (double) this.getJumpPower(), vec3d.z);
|
2021-11-25 10:19:05 +01:00
|
|
|
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)));
|
|
|
|
}
|
|
|
|
|