Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-21 15:59:26 +00:00
Code Issues Releases Activity

Add configurable cap on the damage players can take in a single hit

Browse Source
This commit is contained in:
Samsuik
2025-10-12 23:39:34 +01:00
parent 564c431446
commit 966bf92a3a
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sakura-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
View File

@@ -64,6 +64,19 @@
} else if (damageSource.is(DamageTypeTags.IS_DROWNING)) { } else if (damageSource.is(DamageTypeTags.IS_DROWNING)) {
return !level.getGameRules().getBoolean(GameRules.RULE_DROWNING_DAMAGE); return !level.getGameRules().getBoolean(GameRules.RULE_DROWNING_DAMAGE);
} else if (damageSource.is(DamageTypeTags.IS_FALL)) { } else if (damageSource.is(DamageTypeTags.IS_FALL)) {
@@ -755,6 +_,12 @@
}
}
+ // Sakura start - add max damage taken
+ final double maxDamage = level.sakuraConfig().players.combat.maxDamage.or(-1.0);
+ if (amount > 0.0 && maxDamage >= 0.0) {
+ amount = Math.min(amount, (float) maxDamage);
+ }
+ // Sakura end - add max damage taken
// return amount != 0.0F && super.hurtServer(level, damageSource, amount);
// CraftBukkit start - Don't filter out 0 damage
boolean damaged = super.hurtServer(level, damageSource, amount);
@@ -1030,13 +_,19 @@ @@ -1030,13 +_,19 @@
if (playerAttackEntityEvent.callEvent() && willAttack) { // Logic moved to willAttack local variable. if (playerAttackEntityEvent.callEvent() && willAttack) { // Logic moved to willAttack local variable.
{ {

6
sakura-server/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
View File

@@ -152,6 +152,12 @@ public final class WorldConfiguration extends ConfigurationPart {
public boolean oldEnchantedGoldenApple = false; public boolean oldEnchantedGoldenApple = false;
public boolean oldSoundsAndParticleEffects = false; public boolean oldSoundsAndParticleEffects = false;
public boolean fastHealthRegen = true; public boolean fastHealthRegen = true;
@Comment(
"The maximum damage a player can take in a single hit.\n" +
"This can prevent arrows and maces instantly killing players."
)
public DoubleOr.Disabled maxDamage = DoubleOr.Disabled.DISABLED;
public IntOr.Default maxArmourDamage = IntOr.Default.USE_DEFAULT; public IntOr.Default maxArmourDamage = IntOr.Default.USE_DEFAULT;
} }