re-add "abstract horse" attribute logic

This commit is contained in:
granny
2023-03-22 05:21:04 -07:00
parent 798472879a
commit 9cda2e740b
8 changed files with 345 additions and 77 deletions

View File

@@ -25,7 +25,7 @@ index 721971f7618751a2e95f1c49fdc48a9c0c672cab..7b141c495095afcd9c8b04c059d692e8
double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
if (d > 676.0D) {
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 0352e21d54ce58d0ef36df8e68ce74389daa3b5c..8adca393017dcc2e44a7379b971cd2a4704bc570 100644
index 9953f80e924e8843ceebdbfa675c2315bf6cf63f..2343accfb669e38635eab949ff04a3f729ac3992 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
@@ -73,6 +73,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -36,7 +36,7 @@ index 0352e21d54ce58d0ef36df8e68ce74389daa3b5c..8adca393017dcc2e44a7379b971cd2a4
public Llama(EntityType<? extends Llama> type, Level world) {
super(type, world);
@@ -154,7 +155,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -169,7 +170,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
if (!this.inventory.getItem(1).isEmpty()) {
nbt.put("DecorItem", this.inventory.getItem(1).save(new CompoundTag()));
}
@@ -45,7 +45,7 @@ index 0352e21d54ce58d0ef36df8e68ce74389daa3b5c..8adca393017dcc2e44a7379b971cd2a4
}
@Override
@@ -165,7 +166,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -180,7 +181,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
if (nbt.contains("DecorItem", 10)) {
this.inventory.setItem(1, ItemStack.of(nbt.getCompound("DecorItem")));
}
@@ -54,7 +54,7 @@ index 0352e21d54ce58d0ef36df8e68ce74389daa3b5c..8adca393017dcc2e44a7379b971cd2a4
this.updateContainerEquipment();
}
@@ -506,6 +507,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -521,6 +522,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public void leaveCaravan() {
if (this.caravanHead != null) {
@@ -62,7 +62,7 @@ index 0352e21d54ce58d0ef36df8e68ce74389daa3b5c..8adca393017dcc2e44a7379b971cd2a4
this.caravanHead.caravanTail = null;
}
@@ -513,6 +515,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -528,6 +530,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
}
public void joinCaravan(Llama llama) {