mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
37 lines
1.8 KiB
Diff
37 lines
1.8 KiB
Diff
From b5fe5cfedb0892d65579588e47cd426c64b85dae 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 67b4d576a9..02c52958c8 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -182,6 +182,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/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
index 1b7adbf4ba..a728507c54 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -1036,6 +1036,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
|
|
boolean flag2 = flag && this.fallDistance > 0.0F && !this.onGround && !this.z_() && !this.isInWater() && !this.hasEffect(MobEffects.BLINDNESS) && !this.isPassenger() && entity instanceof EntityLiving;
|
|
|
|
+ flag2 = flag2 && !world.paperConfig.disablePlayerCrits; // Paper
|
|
flag2 = flag2 && !this.isSprinting();
|
|
if (flag2) {
|
|
f *= 1.5F;
|
|
--
|
|
2.19.0
|
|
|