mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
35 lines
1.9 KiB
Diff
35 lines
1.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: MiniDigger <admin@minidigger.me>
|
||
|
|
Date: Sat, 10 Mar 2018 00:50:24 +0100
|
||
|
|
Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 3c39f1bb3d88baaaed4dd43c51faeef89bb5c6c2..48f0385c7203c7955de5a015f3dc42be2ab7b681 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -192,6 +192,11 @@ public class PaperWorldConfig {
|
||
|
|
disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public boolean disablePlayerCrits;
|
||
|
|
+ private void disablePlayerCrits() {
|
||
|
|
+ disablePlayerCrits = getBoolean("game-mechanics.disable-player-crits", false);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
public boolean allChunksAreSlimeChunks;
|
||
|
|
private void allChunksAreSlimeChunks() {
|
||
|
|
allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
index 43868c1e2d2c858a4f02119c3238f615f9b1ee72..63871a3a1981b2e8c7ad74214196e35684acb584 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
@@ -1131,6 +1131,7 @@ public abstract class Player extends LivingEntity {
|
||
|
|
|
||
|
|
boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround && !this.onClimbable() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && target instanceof LivingEntity;
|
||
|
|
|
||
|
|
+ flag2 = flag2 && !level.paperConfig.disablePlayerCrits; // Paper
|
||
|
|
flag2 = flag2 && !this.isSprinting();
|
||
|
|
if (flag2) {
|
||
|
|
f *= 1.5F;
|