Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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/0230-Mobs-always-drop-experience.patch
View File

@@ -437,10 +437,10 @@ index f49d3f6ce2407cec4a855f68cec798cdeff30d35..d46aab019e5a064af5e3fea3154499b5
@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 bef26b0fcebb14a944a13ff4472bf7d86b63dfa1..4d9e961e06e188d03ee3fa100a7133046339d438 100644
index d6d8d00bbb25638fccb43ae9a153f0fb828cf99c..7ad29aacc73ca1cb98b76ad36b92a3edb2256629 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
@@ -30,6 +30,11 @@ public class Donkey extends AbstractChestedHorse {
@@ -45,6 +45,11 @@ public class Donkey extends AbstractChestedHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.donkeyTakeDamageFromWater;
}
@@ -453,10 +453,10 @@ index bef26b0fcebb14a944a13ff4472bf7d86b63dfa1..4d9e961e06e188d03ee3fa100a713304
@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 a72d0836c34961266dc9d39afb7986e4c2b2532c..2686107fd3be37d7011e9925ebb91a12af6db98f 100644
index a3c1f0ce5118e75321b28e65d6ffae2c77314917..fb433878731b824b4d595b7f28626f25bdfabbeb 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
@@ -55,6 +55,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
@@ -70,6 +70,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.horseTakeDamageFromWater;
}
@@ -469,10 +469,10 @@ index a72d0836c34961266dc9d39afb7986e4c2b2532c..2686107fd3be37d7011e9925ebb91a12
@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 b0984897033f5c1b4b202bc2299484a643f7bc19..160071ec8d2dcd75d2283604a31175250ac6b6d5 100644
index 0a2adbda0f1c4c6e3695ee39af687f69663f3ae4..309fd5bccadcc584354d328bd31a6f4591c2d0a0 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
@@ -131,6 +131,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -146,6 +146,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
public boolean isSensitiveToWater() {
return this.level.purpurConfig.llamaTakeDamageFromWater;
}
@@ -485,10 +485,10 @@ index b0984897033f5c1b4b202bc2299484a643f7bc19..160071ec8d2dcd75d2283604a3117525
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 3cf4fcbef7720f51e84ac1b0e0b392bcdbb7c8f3..867aa2cdac6e32cdb02addbd1dd0da3ccf8269ef 100644
index edf3d35cebd3c48e4c2598a0b4ee15be885be625..59f1acea8990ad4e9d3a71f6f1c790c4356169f0 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
@@ -29,6 +29,11 @@ public class Mule extends AbstractChestedHorse {
@@ -44,6 +44,11 @@ public class Mule extends AbstractChestedHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.muleTakeDamageFromWater;
}
@@ -501,10 +501,10 @@ index 3cf4fcbef7720f51e84ac1b0e0b392bcdbb7c8f3..867aa2cdac6e32cdb02addbd1dd0da3c
@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 6b97898fae19e755b57eb13e2577e774024ba1e3..93ea9e8bb1f8d7746f122b2939e00c98ce6fec10 100644
index 0cb8982a159bc30c9601082347decd89815af9ee..ac3f8e004445dde937625ecaad7d51a3576e37d3 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
@@ -43,6 +43,11 @@ public class SkeletonHorse extends AbstractHorse {
@@ -58,6 +58,11 @@ public class SkeletonHorse extends AbstractHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.skeletonHorseTakeDamageFromWater;
}
@@ -517,10 +517,10 @@ index 6b97898fae19e755b57eb13e2577e774024ba1e3..93ea9e8bb1f8d7746f122b2939e00c98
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 dc5e763ee7c61a4ec2fc13275e16755d91d22552..4178265a19b717259822ab8fafd687603221c743 100644
index 5bae585bb21f6e1a72964706a8b990dc6851b30d..834ab8bc597a5fb195e94454c0f9b81cf4c7e0f3 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
@@ -57,6 +57,11 @@ public class TraderLlama extends Llama {
@@ -72,6 +72,11 @@ public class TraderLlama extends Llama {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.traderLlamaTakeDamageFromWater;
}
@@ -533,10 +533,10 @@ index dc5e763ee7c61a4ec2fc13275e16755d91d22552..4178265a19b717259822ab8fafd68760
@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 1e22232350cd804c9efa999e9f10042ef4b241cc..02fa2e6c697d91fd0bc3dc4347bdf52b5a3a36b7 100644
index 78eb44e299689f9532009d3a312555e8d8d24f1d..ae663a9b32c281f745592afa614f55c0280b4c58 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
@@ -41,6 +41,11 @@ public class ZombieHorse extends AbstractHorse {
@@ -56,6 +56,11 @@ public class ZombieHorse extends AbstractHorse {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.zombieHorseTakeDamageFromWater;
}