From 8fa99b34fb4e936d91e6a1f17282092a1bc32f41 Mon Sep 17 00:00:00 2001 From: Bierque Jason Date: Mon, 17 May 2021 03:09:05 +0200 Subject: [PATCH] Configurable critical damage multiplier (#339) --- ...nge-multiplier-critical-damage-value.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch diff --git a/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch new file mode 100644 index 0000000000..751cc7e12e --- /dev/null +++ b/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: DoctaEnkoda +Date: Mon, 17 May 2021 02:40:13 +0200 +Subject: [PATCH] Add config change multiplier critical damage value + + +diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java +index 663dfa707dd948df2f25dab287fa4a0580070b75..abac4b996c7935ac6115a9ad96191f2a57afc95f 100644 +--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java ++++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java +@@ -1189,7 +1189,7 @@ public abstract class EntityHuman extends EntityLiving { + flag2 = flag2 && !this.isSprinting(); + if (flag2) { + this.isCritical = true; // Purpur +- f *= 1.5F; ++ f *= this.world.purpurConfig.playerCriticalDamageMultiplier; // Purpur + } + + f += f1; +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..78af40e0fe7faeca45ab7ef1264a02fc2c61f2b6 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -356,6 +356,7 @@ public class PurpurWorldConfig { + public boolean creativeOnePunch = false; + public boolean playerSleepNearMonsters = false; + public boolean playersSkipNight = true; ++ public double playerCriticalDamageMultiplier = 1.5D; + private void miscGameplayMechanicsSettings() { + useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); + alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative); +@@ -377,6 +378,7 @@ public class PurpurWorldConfig { + creativeOnePunch = getBoolean("gameplay-mechanics.player.one-punch-in-creative", creativeOnePunch); + playerSleepNearMonsters = getBoolean("gameplay-mechanics.player.sleep-ignore-nearby-mobs", playerSleepNearMonsters); + playersSkipNight = getBoolean("gameplay-mechanics.player.can-skip-night", playersSkipNight); ++ playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier); + } + + public boolean catSpawning;