Skip to content

Commit d76d40d

Browse files
committed
Iron golems take fall damage
1 parent 71b28be commit d76d40d

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

patches/server/0004-Sakura-Configuration-Files.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,10 @@ index 0000000000000000000000000000000000000000..5fc23a0b579d7cbe03baf5324bef887a
621621
+}
622622
diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
623623
new file mode 100644
624-
index 0000000000000000000000000000000000000000..123708bc292843dca90501d757346769f8b9f353
624+
index 0000000000000000000000000000000000000000..376322d8e47e24a76c7162d6379c7f71debd7505
625625
--- /dev/null
626626
+++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
627-
@@ -0,0 +1,169 @@
627+
@@ -0,0 +1,170 @@
628628
+package me.samsuik.sakura.configuration;
629629
+
630630
+import com.mojang.logging.LogUtils;
@@ -775,6 +775,7 @@ index 0000000000000000000000000000000000000000..123708bc292843dca90501d757346769
775775
+ public boolean disableMobAi = false;
776776
+ public boolean waterSensitivity = true;
777777
+ public boolean instantDeathAnimation = false;
778+
+ public boolean ironGolemsTakeFalldamage = false;
778779
+
779780
+ public Items items = new Items();
780781
+ public class Items extends ConfigurationPart {
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Samsuik <[email protected]>
3+
Date: Sat, 9 Dec 2023 16:10:29 +0000
4+
Subject: [PATCH] Iron golems take fall damage
5+
6+
7+
diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
8+
index f383928fc5b331ddf128bdcb6a23010d8fe088d3..4dd778901f0327d30b993dffd73f75f631bb3a9b 100644
9+
--- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
10+
+++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
11+
@@ -240,6 +240,20 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
12+
13+
}
14+
15+
+ // Sakura start
16+
+ @Override
17+
+ protected int calculateFallDamage(float fallDistance, float damageMultiplier) {
18+
+ if (!this.level().sakuraConfig().entity.ironGolemsTakeFalldamage) {
19+
+ return super.calculateFallDamage(fallDistance, damageMultiplier);
20+
+ } else {
21+
+ net.minecraft.world.effect.MobEffectInstance mobeffect = this.getEffect(net.minecraft.world.effect.MobEffects.JUMP);
22+
+ float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
23+
+
24+
+ return net.minecraft.util.Mth.ceil((fallDistance - 3.0F - f2) * damageMultiplier);
25+
+ }
26+
+ }
27+
+ // Sakura end
28+
+
29+
public int getAttackAnimationTick() {
30+
return this.attackAnimationTick;
31+
}

0 commit comments

Comments
 (0)