port Toggle for water sensitive mob damage patch

This commit is contained in:
granny
2025-01-10 13:12:03 -08:00
committed by granny
parent fafdf0f8a7
commit 8e189a417b
5 changed files with 1493 additions and 2439 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1320,23 +1320,25 @@ index a58a0d5d3872a57c8c5e464bd0f6d2fd7a054990..acfb473c0a085ed516ff25ebac366700
protected void registerGoals() {
super.registerGoals();
diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
index 87507f5fad41e7339b02e8a425d41d6213656fbb..9c17ffa96361ad374ec2d0d5816f3cb300b45b15 100644
index 87507f5fad41e7339b02e8a425d41d6213656fbb..612d57abee28e702390b9cd746a49d84d9feedf7 100644
--- a/net/minecraft/world/entity/monster/Shulker.java
+++ b/net/minecraft/world/entity/monster/Shulker.java
@@ -105,6 +105,12 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -105,6 +105,14 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
}
// Purpur end - Ridables
+ // Purpur start - Configurable entity base attributes
+ @Override
+ public void initAttributes() {
+ this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.shulkerMaxHealth);
+ this.getAttribute(Attributes.SCALE).setBaseValue(this.level().purpurConfig.shulkerScale);
+ }
+ // Purpur end - Configurable entity base attributes
+
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
@@ -582,7 +588,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -582,7 +590,7 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@Override
protected float sanitizeScale(float scale) {
@@ -1478,7 +1480,7 @@ index ed7ba19870a09ac78c1f069040a25e47c4b19d3a..0323456fca18450c22bf3999df97ff14
EntityType<Stray> entityType, ServerLevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random
) {
diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
index 15c1608b1a8f4d59b1d2cbc9c113ac3198119fb2..30cfd9b98f84f2aaa80aab529574d993b6d65c96 100644
index 78671f02ef28f4a3b796b357d21fb4c9b64c153e..be0dc92bf5ae3da1368a649e9c4e7ff5dbb1c67c 100644
--- a/net/minecraft/world/entity/monster/Strider.java
+++ b/net/minecraft/world/entity/monster/Strider.java
@@ -111,6 +111,14 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {

View File

@@ -401,10 +401,10 @@ index 9a400c8bf2b54aa5fbcbe65b61670cac5fbebf05..c4ea9485294b7dec2582c638802f003a
protected Brain.Provider<Frog> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
index 9924a39953fb49954d02c771ae1a51411226ceac..e7337eaa2813c30b92fd518f12ef4ba0c17ec6a3 100644
index 9924a39953fb49954d02c771ae1a51411226ceac..16fe9367466372eb7cd0ecf24ba5b7cbc64a820c 100644
--- a/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/net/minecraft/world/entity/animal/goat/Goat.java
@@ -128,6 +128,12 @@ public class Goat extends Animal {
@@ -128,6 +128,13 @@ public class Goat extends Animal {
}
// Purpur end - Ridables
@@ -414,6 +414,7 @@ index 9924a39953fb49954d02c771ae1a51411226ceac..e7337eaa2813c30b92fd518f12ef4ba0
+ return this.level().purpurConfig.goatBreedingTicks;
+ }
+ // Purpur end - Make entity breeding times configurable
+
@Override
protected Brain.Provider<Goat> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
@@ -562,7 +563,7 @@ index a5ff61a3697e2299c96288b6f8d7c6f2511d86d5..11a5da22149a61ca48bbb0a8ed10b71e
protected void defineSynchedData(SynchedEntityData.Builder builder) {
super.defineSynchedData(builder);
diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java
index 30cfd9b98f84f2aaa80aab529574d993b6d65c96..10ce387c4bb0529624d78e0ae41423e15530793f 100644
index be0dc92bf5ae3da1368a649e9c4e7ff5dbb1c67c..f36e94437b4e21961532ac9ab91767617f9c3c32 100644
--- a/net/minecraft/world/entity/monster/Strider.java
+++ b/net/minecraft/world/entity/monster/Strider.java
@@ -119,6 +119,13 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -580,10 +581,10 @@ index 30cfd9b98f84f2aaa80aab529574d993b6d65c96..10ce387c4bb0529624d78e0ae41423e1
EntityType<Strider> entityType, LevelAccessor level, EntitySpawnReason spawnReason, BlockPos pos, RandomSource random
) {
diff --git a/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index 54924cd7c84cbcd22ffc0bd37fc24f24e73c18bc..b2edc0723a0d60801716cec31abf7403a06a903a 100644
index 54924cd7c84cbcd22ffc0bd37fc24f24e73c18bc..266d1838e6602ef6322c15732f2693a865911f2e 100644
--- a/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -122,6 +122,12 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -122,6 +122,13 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
this.timeInOverworld = timeInOverworld;
}
@@ -593,6 +594,7 @@ index 54924cd7c84cbcd22ffc0bd37fc24f24e73c18bc..b2edc0723a0d60801716cec31abf7403
+ return this.level().purpurConfig.hoglinBreedingTicks;
+ }
+ // Purpur end - Make entity breeding times configurable
+
@Override
public boolean canBeLeashed() {
return true;