mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-28 07:29:40 +02:00
Upstream has released updates that appears 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: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes:a46fdbc6
Remove outdated build delay.3697519b
SPIGOT-4708: Fix ExactChoice recipes neglecting material9ead7009
SPIGOT-4677: Add minecraft.admin.command_feedback permissionc3749a23
Remove the Damage tag from items when it is 0.f74c7b95
SPIGOT-4706: Can't interact with active item494eef45
Mention requirement of JIRA ticket for bug fixes51d62dec
SPIGOT-4702: Exception when middle clicking certain slotsbe557e69
SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
38 lines
1.8 KiB
Diff
38 lines
1.8 KiB
Diff
From 0bef2f366cef39dcaf0a10707d705746496694b2 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 07a8ef697f..f68b8a4b05 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -191,6 +191,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 259f73f66e..1640098c35 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -1029,6 +1029,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.21.0
|
|
|