9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-31 12:56:29 +00:00

Fix build

This commit is contained in:
Dreeam
2024-06-23 10:49:14 +08:00
parent 7db531b0aa
commit cf76aa8c1a

View File

@@ -29,22 +29,18 @@ index a9285aac811067313c5609d2d5708783736e6cb5..53114ceb212ea341b227f59ebd302d7c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 4578fc25456361b76c9821f066fd8a628cd4bd67..e528b4df9ce1c7461bd1d461932593c2b55b5786 100644
index 4578fc25456361b76c9821f066fd8a628cd4bd67..5e8f565511751509d1d9c47cd0583bcfbed9b63f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -129,7 +129,11 @@ public class Zombie extends Monster {
@Override
@@ -130,6 +130,7 @@ public class Zombie extends Monster {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.zombieMaxHealth);
+<<<<<<< HEAD
this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.zombieScale);
+=======
+ this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(this.level().purpurConfig.zombieMovementSpeed); // Leaf - Configurable zombie movement speed
+>>>>>>> 2807e0848 (Configurable movement speed of more entities)
}
public boolean jockeyOnlyBaby() {
@@ -187,9 +191,15 @@ public class Zombie extends Monster {
@@ -187,9 +188,15 @@ public class Zombie extends Monster {
this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
}