From ce2e501de4e641f7b540df73b5f6f007c0d21d3f Mon Sep 17 00:00:00 2001 From: DoctaEnkoda Date: Mon, 17 May 2021 02:41:44 +0200 Subject: [PATCH 1/4] Add config change multiplier critical damage value by world --- ...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..c40c0379e3 --- /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..620313bd5003a672ad8f75a39fbbee4fff123515 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.criticalDamage; // 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..59cac5aacba6d3b3bd77b58db8e4591372647df9 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 criticalDamage = 1.5F; + 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); ++ criticalDamage = getDouble("gameplay-mechanics.player.multiplier-critical-damage-value", criticalDamage); + } + + public boolean catSpawning; From 9fc9e4b6e1d561ad1a9fbcdd01913636d188dffe Mon Sep 17 00:00:00 2001 From: DoctaEnkoda Date: Mon, 17 May 2021 02:44:34 +0200 Subject: [PATCH 2/4] change variable name - change float to double config --- ...Add-config-change-multiplier-critical-damage-value.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index c40c0379e3..7076e5c577 100644 --- a/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch @@ -13,7 +13,7 @@ index 663dfa707dd948df2f25dab287fa4a0580070b75..620313bd5003a672ad8f75a39fbbee4f if (flag2) { this.isCritical = true; // Purpur - f *= 1.5F; -+ f *= this.world.purpurConfig.criticalDamage; // Purpur ++ f *= this.world.purpurConfig.criticalDamageMultiplier; // Purpur } f += f1; @@ -25,7 +25,7 @@ index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..59cac5aacba6d3b3bd77b58db8e45913 public boolean creativeOnePunch = false; public boolean playerSleepNearMonsters = false; public boolean playersSkipNight = true; -+ public double criticalDamage = 1.5F; ++ public double criticalDamageMultiplier = 1.5D; private void miscGameplayMechanicsSettings() { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); alwaysTameInCreative = getBoolean("gameplay-mechanics.always-tame-in-creative", alwaysTameInCreative); @@ -33,7 +33,7 @@ index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..59cac5aacba6d3b3bd77b58db8e45913 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); -+ criticalDamage = getDouble("gameplay-mechanics.player.multiplier-critical-damage-value", criticalDamage); ++ criticalDamageMultiplier = getDouble("gameplay-mechanics.player.multiplier-critical-damage-value", criticalDamageMultiplier); } public boolean catSpawning; From 7a9f213926968f70c48c6b39fa837798fd715496 Mon Sep 17 00:00:00 2001 From: DoctaEnkoda Date: Mon, 17 May 2021 02:46:39 +0200 Subject: [PATCH 3/4] change variable name by playerCriticalDamageMultiplier --- ...Add-config-change-multiplier-critical-damage-value.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index 7076e5c577..c586993d49 100644 --- a/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch @@ -13,7 +13,7 @@ index 663dfa707dd948df2f25dab287fa4a0580070b75..620313bd5003a672ad8f75a39fbbee4f if (flag2) { this.isCritical = true; // Purpur - f *= 1.5F; -+ f *= this.world.purpurConfig.criticalDamageMultiplier; // Purpur ++ f *= this.world.purpurConfig.playerCriticalDamageMultiplier; // Purpur } f += f1; @@ -25,7 +25,7 @@ index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..59cac5aacba6d3b3bd77b58db8e45913 public boolean creativeOnePunch = false; public boolean playerSleepNearMonsters = false; public boolean playersSkipNight = true; -+ public double criticalDamageMultiplier = 1.5D; ++ 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); @@ -33,7 +33,7 @@ index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..59cac5aacba6d3b3bd77b58db8e45913 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); -+ criticalDamageMultiplier = getDouble("gameplay-mechanics.player.multiplier-critical-damage-value", criticalDamageMultiplier); ++ playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.multiplier-critical-damage-value", playerCriticalDamageMultiplier); } public boolean catSpawning; From cfc2d00d36c9139c4b00b89bfc12e6b6874bae52 Mon Sep 17 00:00:00 2001 From: DoctaEnkoda Date: Mon, 17 May 2021 02:50:30 +0200 Subject: [PATCH 4/4] change path --- ...Add-config-change-multiplier-critical-damage-value.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index c586993d49..751cc7e12e 100644 --- a/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0216-Add-config-change-multiplier-critical-damage-value.patch @@ -5,7 +5,7 @@ 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..620313bd5003a672ad8f75a39fbbee4fff123515 100644 +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 { @@ -18,7 +18,7 @@ index 663dfa707dd948df2f25dab287fa4a0580070b75..620313bd5003a672ad8f75a39fbbee4f f += f1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..59cac5aacba6d3b3bd77b58db8e4591372647df9 100644 +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 { @@ -33,7 +33,7 @@ index 99c196f1262660b901f84c0ac66d10c9d1e6bcf7..59cac5aacba6d3b3bd77b58db8e45913 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.multiplier-critical-damage-value", playerCriticalDamageMultiplier); ++ playerCriticalDamageMultiplier = getDouble("gameplay-mechanics.player.critical-damage-multiplier", playerCriticalDamageMultiplier); } public boolean catSpawning;