mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-29 15:07:34 +02:00
2d09115b3a
Uses the new ANSIComponentSerializer introduced in Adventure 4.14.0 to serialize components when logging them via the ComponentLogger, or when sending messages to the console. This replaces the old solution which uses legacy jank and custom color conversions, with a new library that handles the conversion and config
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nassim Jahnke <nassim@njahnke.dev>
|
|
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 dd95550877d67d8521a96f1e31994cff894502e1..70cdcc7508998ef1b107f60c619c3d521dadd124 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -2658,13 +2658,26 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
return this.hasEffect(MobEffects.JUMP) ? 0.1F * ((float) this.getEffect(MobEffects.JUMP).getAmplifier() + 1.0F) : 0.0F;
|
|
}
|
|
|
|
+ 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
|
|
|
|
this.setDeltaMovement(vec3d.x, (double) this.getJumpPower(), 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)));
|
|
}
|
|
|