mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
8bd08ceeea
Upstream has released updates that appear to apply and compile correctly Paper Changes:06db5d08b0Updated Upstream (Bukkit/CraftBukkit) (#6589)810d200bb4Improve interact distance check (#6591) Airplane Changes:8207533bdfUpstream
39 lines
2.5 KiB
Diff
39 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: oharass <oharass@bk.ru>
|
|
Date: Mon, 6 Sep 2021 05:53:11 +0300
|
|
Subject: [PATCH] llama tempted by hay config
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
|
index 8f12851f220bb23102f52f523a4c5d9855a46e95..02035b4d062e4a44b8711d940cc3680c3132fb4d 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
|
@@ -185,6 +185,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
|
|
this.goalSelector.addGoal(3, new RangedAttackGoal(this, 1.25D, 40, 20.0F));
|
|
this.goalSelector.addGoal(3, new PanicGoal(this, 1.2D));
|
|
this.goalSelector.addGoal(4, new BreedGoal(this, 1.0D));
|
|
+ if (this.level.purpurConfig.llamaTemptedByHay) this.goalSelector.addGoal(5, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.25D, Ingredient.of(Items.HAY_BLOCK), false)); // Purpur
|
|
this.goalSelector.addGoal(5, new FollowParentGoal(this, 1.0D));
|
|
this.goalSelector.addGoal(6, new WaterAvoidingRandomStrollGoal(this, 0.7D));
|
|
this.goalSelector.addGoal(7, new LookAtPlayerGoal(this, Player.class, 6.0F));
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index e5e44a03efdf4c3c7309b0572af275adf8243731..f2c1e1a97c4fe264df6ab36ffb1ceff77e54a936 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -1597,6 +1597,7 @@ public class PurpurWorldConfig {
|
|
public double llamaMovementSpeedMax = 0.175D;
|
|
public int llamaBreedingTicks = 6000;
|
|
public boolean llamaJoinCaravans = true;
|
|
+ public boolean llamaTemptedByHay = false;
|
|
private void llamaSettings() {
|
|
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
|
|
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
|
|
@@ -1615,6 +1616,7 @@ public class PurpurWorldConfig {
|
|
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
|
|
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
|
|
llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans);
|
|
+ llamaTemptedByHay = getBoolean("mobs.llama.tempted-by-hay", llamaTemptedByHay);
|
|
}
|
|
|
|
public boolean magmaCubeRidable = false;
|