Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

re-add "abstract horse" attribute logic

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0130-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -443,10 +443,10 @@ index b2c025184b9d8d272fab720a5930c030312d6e03..f49d3f6ce2407cec4a855f68cec798cd
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
index 0a5313546858a235c071f15d91edc4f161f6a351..bef26b0fcebb14a944a13ff4472bf7d86b63dfa1 100644
index fdb32983ddb979b53f547b6ec999cfae539b8179..d6d8d00bbb25638fccb43ae9a153f0fb828cf99c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
@@ -25,6 +25,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -40,6 +40,11 @@ public class Donkey extends AbstractChestedHorse {
public int getPurpurBreedTime() {
return this.level.purpurConfig.donkeyBreedingTicks;
}
@@ -459,10 +459,10 @@ index 0a5313546858a235c071f15d91edc4f161f6a351..bef26b0fcebb14a944a13ff4472bf7d8
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
index dc8ebffdd6e64dd11d1e254ea1860f287f40aa50..a72d0836c34961266dc9d39afb7986e4c2b2532c 100644
index a129757a6ad38aaea854dbfe97eb6673058d3f31..a3c1f0ce5118e75321b28e65d6ffae2c77314917 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
@@ -50,6 +50,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -65,6 +65,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public int getPurpurBreedTime() {
return this.level.purpurConfig.horseBreedingTicks;
}
@@ -475,10 +475,10 @@ index dc8ebffdd6e64dd11d1e254ea1860f287f40aa50..a72d0836c34961266dc9d39afb7986e4
@Override
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 2f585de77bb8ad5431a48710d341dff0321b124d..68796219152f05352f99ffb35a00640d391563af 100644
index 5de1bd35bdd064d1bcdd891719352beb2dae662b..de0e0b3d7b300f82717e9b69a5d6fe7dd70e1f1c 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
@@ -126,6 +126,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -141,6 +141,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public int getPurpurBreedTime() {
return this.level.purpurConfig.llamaBreedingTicks;
}
@@ -491,10 +491,10 @@ index 2f585de77bb8ad5431a48710d341dff0321b124d..68796219152f05352f99ffb35a00640d
public boolean isTraderLlama() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
index 183c8a1355d373a7cda91532eba3d62a58639167..3cf4fcbef7720f51e84ac1b0e0b392bcdbb7c8f3 100644
index 9a192232110cc7415ddb9bf0eac066511ed2998e..edf3d35cebd3c48e4c2598a0b4ee15be885be625 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
@@ -24,6 +24,11 @@ public class Mule extends AbstractChestedHorse {
@@ -39,6 +39,11 @@ public class Mule extends AbstractChestedHorse {
public int getPurpurBreedTime() {
return this.level.purpurConfig.muleBreedingTicks;
}
@@ -507,10 +507,10 @@ index 183c8a1355d373a7cda91532eba3d62a58639167..3cf4fcbef7720f51e84ac1b0e0b392bc
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
index 33250d34cc6e2733330f9c4a42f498b2bbc73b33..6b97898fae19e755b57eb13e2577e774024ba1e3 100644
index fa25f231fb305a5d0930b8777bbb4b0c2bd1134d..0cb8982a159bc30c9601082347decd89815af9ee 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
@@ -38,6 +38,11 @@ public class SkeletonHorse extends AbstractHorse {
@@ -53,6 +53,11 @@ public class SkeletonHorse extends AbstractHorse {
public int getPurpurBreedTime() {
return 6000;
}
@@ -523,10 +523,10 @@ index 33250d34cc6e2733330f9c4a42f498b2bbc73b33..6b97898fae19e755b57eb13e2577e774
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
index 5a000d95d013d9c3251ad9eafd92700091db2857..dc5e763ee7c61a4ec2fc13275e16755d91d22552 100644
index 062439bb88dd102c679e61c1c2b7781861ec48c3..5bae585bb21f6e1a72964706a8b990dc6851b30d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
@@ -52,6 +52,11 @@ public class TraderLlama extends Llama {
@@ -67,6 +67,11 @@ public class TraderLlama extends Llama {
public int getPurpurBreedTime() {
return this.level.purpurConfig.traderLlamaBreedingTicks;
}
@@ -539,10 +539,10 @@ index 5a000d95d013d9c3251ad9eafd92700091db2857..dc5e763ee7c61a4ec2fc13275e16755d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
index 488bb0af3acb5bc077b0f4026fc0f3bd8ea081ac..1e22232350cd804c9efa999e9f10042ef4b241cc 100644
index b56db8da5002bd18552fbc5a96a74fbda5a1a9b0..78eb44e299689f9532009d3a312555e8d8d24f1d 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
@@ -36,6 +36,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -51,6 +51,11 @@ public class ZombieHorse extends AbstractHorse {
public int getPurpurBreedTime() {
return 6000;
}