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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index 18804ea960f8423d172d9119c0739226a18d4d56..d4abce0b715d5eda99505fa0e29eeab20b538fd9 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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -2697,13 +2697,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
|
|
|
}
|
|
|
|
|
2024-01-19 12:30:04 +01:00
|
|
|
+ protected long lastJumpTime = 0L; // Paper - Prevent excessive velocity through repeated crits
|
2021-11-25 10:19:05 +01:00
|
|
|
protected void jumpFromGround() {
|
|
|
|
Vec3 vec3d = this.getDeltaMovement();
|
2024-01-19 12:30:04 +01:00
|
|
|
+ // Paper start - Prevent excessive velocity through repeated crits
|
2021-11-25 10:19:05 +01:00
|
|
|
+ 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;
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-19 12:30:04 +01:00
|
|
|
+ // Paper end - Prevent excessive velocity through repeated crits
|
2021-11-25 10:19:05 +01:00
|
|
|
|
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;
|
|
|
|
|
2024-01-19 12:30:04 +01:00
|
|
|
+ if (canCrit) // Paper - Prevent excessive velocity through repeated crits
|
2021-11-25 10:19:05 +01:00
|
|
|
this.setDeltaMovement(this.getDeltaMovement().add((double) (-Mth.sin(f) * 0.2F), 0.0D, (double) (Mth.cos(f) * 0.2F)));
|
|
|
|
}
|
|
|
|
|