Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +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

58
patches/server/0104-Make-entity-breeding-times-configurable.patch
View File

@@ -316,7 +316,7 @@ index eaf2e6b9865a36b7c648bd1205db922a62cd7ee8..1af75e173958c192b8f53b7e17e75d98
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index 05c7680569346bb863b896bcc9515f3e7cfb8114..bda7a0e29e40386c57766c224ffb8938d33447e8 100644
index a58028bfd3722210e801e85c355d679cd8557e85..a66f77ec5cb5a2b9f6944c2a747b22d8f89e9cb7 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -83,6 +83,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
@@ -365,12 +365,12 @@ index 1cfc1ade52b79c6c5577935fe5c37a0e7a1673f0..b2c025184b9d8d272fab720a5930c030
@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 6ed4ef1c628b77448629388bfc4a8575dd4afefd..0a5313546858a235c071f15d91edc4f161f6a351 100644
index 7afd065d6a5d5b9650e64a26449dcf81724744bb..fdb32983ddb979b53f547b6ec999cfae539b8179 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
@@ -20,6 +20,11 @@ public class Donkey extends AbstractChestedHorse {
public boolean dismountsUnderwater() {
return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.donkeyRidableInWater;
@@ -35,6 +35,11 @@ public class Donkey extends AbstractChestedHorse {
public double generateSpeed(net.minecraft.util.RandomSource random) {
return generateSpeed(this.level.purpurConfig.donkeyMovementSpeedMin, this.level.purpurConfig.donkeyMovementSpeedMax);
}
+
+ @Override
@@ -381,12 +381,12 @@ index 6ed4ef1c628b77448629388bfc4a8575dd4afefd..0a5313546858a235c071f15d91edc4f1
@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 9d8879fc2f7afafdd42cd8ee471c698b31159209..dc8ebffdd6e64dd11d1e254ea1860f287f40aa50 100644
index fcd5afe0e25482877894fde500ddf7a0cb290b62..a129757a6ad38aaea854dbfe97eb6673058d3f31 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
@@ -45,6 +45,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public boolean dismountsUnderwater() {
return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.horseRidableInWater;
@@ -60,6 +60,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public double generateSpeed(RandomSource random) {
return generateSpeed(this.level.purpurConfig.horseMovementSpeedMin, this.level.purpurConfig.horseMovementSpeedMax);
}
+
+ @Override
@@ -397,12 +397,12 @@ index 9d8879fc2f7afafdd42cd8ee471c698b31159209..dc8ebffdd6e64dd11d1e254ea1860f28
@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 766285d0a62cf5314c99eba8c81ac29f171a2b0a..2f585de77bb8ad5431a48710d341dff0321b124d 100644
index 2343accfb669e38635eab949ff04a3f729ac3992..5de1bd35bdd064d1bcdd891719352beb2dae662b 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
@@ -121,6 +121,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public boolean isSaddled() {
return super.isSaddled() || (isTamed() && getSwag() != null);
@@ -136,6 +136,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public double generateSpeed(RandomSource random) {
return generateSpeed(this.level.purpurConfig.llamaMovementSpeedMin, this.level.purpurConfig.llamaMovementSpeedMax);
}
+
+ @Override
@@ -413,12 +413,12 @@ index 766285d0a62cf5314c99eba8c81ac29f171a2b0a..2f585de77bb8ad5431a48710d341dff0
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 84d265aaa4a2c5942e3ca04deab644570bb8ee83..183c8a1355d373a7cda91532eba3d62a58639167 100644
index c18806e6adeccafcd4731aab0c9949788e72164b..9a192232110cc7415ddb9bf0eac066511ed2998e 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
@@ -19,6 +19,11 @@ public class Mule extends AbstractChestedHorse {
public boolean dismountsUnderwater() {
return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.muleRidableInWater;
@@ -34,6 +34,11 @@ public class Mule extends AbstractChestedHorse {
public double generateSpeed(net.minecraft.util.RandomSource random) {
return generateSpeed(this.level.purpurConfig.muleMovementSpeedMin, this.level.purpurConfig.muleMovementSpeedMax);
}
+
+ @Override
@@ -429,12 +429,12 @@ index 84d265aaa4a2c5942e3ca04deab644570bb8ee83..183c8a1355d373a7cda91532eba3d62a
@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 7c891be8b94a6438910a53c0473393d49b19f5d9..33250d34cc6e2733330f9c4a42f498b2bbc73b33 100644
index 6d68ac4a6cd65baaf7789cc0567492e43ad5bf91..fa25f231fb305a5d0930b8777bbb4b0c2bd1134d 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
@@ -33,6 +33,11 @@ public class SkeletonHorse extends AbstractHorse {
public boolean isTamed() {
return true;
@@ -48,6 +48,11 @@ public class SkeletonHorse extends AbstractHorse {
public double generateSpeed(RandomSource random) {
return generateSpeed(this.level.purpurConfig.skeletonHorseMovementSpeedMin, this.level.purpurConfig.skeletonHorseMovementSpeedMax);
}
+
+ @Override
@@ -445,12 +445,12 @@ index 7c891be8b94a6438910a53c0473393d49b19f5d9..33250d34cc6e2733330f9c4a42f498b2
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 6747dbd11a883249f18cd51320daa663d6203bb7..5a000d95d013d9c3251ad9eafd92700091db2857 100644
index 17b29f0245c8c140528871aeada7ee36ce22944c..062439bb88dd102c679e61c1c2b7781861ec48c3 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
@@ -47,6 +47,11 @@ public class TraderLlama extends Llama {
public boolean isSaddled() {
return super.isSaddled() || isTamed();
@@ -62,6 +62,11 @@ public class TraderLlama extends Llama {
public double generateSpeed(net.minecraft.util.RandomSource random) {
return generateSpeed(this.level.purpurConfig.traderLlamaMovementSpeedMin, this.level.purpurConfig.traderLlamaMovementSpeedMax);
}
+
+ @Override
@@ -461,12 +461,12 @@ index 6747dbd11a883249f18cd51320daa663d6203bb7..5a000d95d013d9c3251ad9eafd927000
@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 b6e2e7398413296449e8f132a2a6296da231f4d4..488bb0af3acb5bc077b0f4026fc0f3bd8ea081ac 100644
index e818bd705b03aa1fedfd981ec44c9b8267c67a00..b56db8da5002bd18552fbc5a96a74fbda5a1a9b0 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
@@ -31,6 +31,11 @@ public class ZombieHorse extends AbstractHorse {
public boolean isTamed() {
return true;
@@ -46,6 +46,11 @@ public class ZombieHorse extends AbstractHorse {
public double generateSpeed(RandomSource random) {
return generateSpeed(this.level.purpurConfig.zombieHorseMovementSpeedMin, this.level.purpurConfig.zombieHorseMovementSpeedMax);
}
+
+ @Override