diff options
| author | Lulu13022002 <[email protected]> | 2024-05-29 20:17:56 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-29 11:17:56 -0700 |
| commit | 84f6e6e0b1a88ca749446ec33608cf13fa82ebf7 (patch) | |
| tree | 03ce6538313548ec1f63d9202b9ab54bd8f28b0c /patches/server/0570-Missing-Entity-API.patch | |
| parent | 9d6f2cced75c1a433c508ab531a61872bce73854 (diff) | |
| download | Paper-84f6e6e0b1a88ca749446ec33608cf13fa82ebf7.tar.gz Paper-84f6e6e0b1a88ca749446ec33608cf13fa82ebf7.zip | |
Fix max temper API for llama (#10823)
Diffstat (limited to 'patches/server/0570-Missing-Entity-API.patch')
| -rw-r--r-- | patches/server/0570-Missing-Entity-API.patch | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/patches/server/0570-Missing-Entity-API.patch b/patches/server/0570-Missing-Entity-API.patch index 312f0f6ea5..1f27707e2d 100644 --- a/patches/server/0570-Missing-Entity-API.patch +++ b/patches/server/0570-Missing-Entity-API.patch @@ -237,10 +237,10 @@ index d53ef42e64d87790ea86d806153f047005accb9f..57952ad65c905265799ba2d8f99cc4cf if (angry) { this.setEating(false); 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 37da58385ecf40baeb4665a0d9c262da03c01763..4fa1a12e7e5c23e1d902b59f2a315eac64134aa8 100644 +index 37da58385ecf40baeb4665a0d9c262da03c01763..b6574ffbe3b9fac6ce0f4d398508c9914139f7ec 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 -@@ -74,7 +74,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V +@@ -74,10 +74,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V @Nullable private Llama caravanHead; @Nullable @@ -249,6 +249,19 @@ index 37da58385ecf40baeb4665a0d9c262da03c01763..4fa1a12e7e5c23e1d902b59f2a315eac public Llama(EntityType<? extends Llama> type, Level world) { super(type, world); ++ this.maxDomestication = 30; // Paper - Missing entity API; configure max temper instead of a hardcoded value + } + + public boolean isTraderLlama() { +@@ -318,7 +319,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V + + @Override + public int getMaxTemper() { +- return 30; ++ return super.getMaxTemper(); // Paper - Missing entity API; delegate to parent + } + + @Override diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java index b0ac85dc3c67d2e4d70dfb09d4e8fc349aba14d2..b5cb4e4682f66ac9423af8d1547d0f1a4f9e6c5d 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java |