mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Fix burn in daylight api not working for all mobs (#1758)
This commit is contained in:
@@ -113,7 +113,7 @@ index a8e6e703a51130066547724dd08bdfe5e11c99e5..3327b93f095b6b6b6d5620bffd03232d
|
||||
public float getWalkTargetValue(BlockPos pos, LevelReader level) {
|
||||
return level.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : level.getPathfindingCostFromLightLevels(pos);
|
||||
diff --git a/net/minecraft/world/entity/animal/dolphin/Dolphin.java b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||
index d73789bb8ce0f65be94437484c3ed41e26cd7510..bea132780ef9b8aac23dbd38cebed080082c2a87 100644
|
||||
index e3646a05c6cb973fad36297cc18cf48587a6f5cd..ea3ccc1f39f70c8ce407ed94ab19a3caa3b90dc4 100644
|
||||
--- a/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||
+++ b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
|
||||
@@ -167,6 +167,13 @@ public class Dolphin extends AgeableWaterCreature {
|
||||
@@ -239,10 +239,10 @@ index 4c07cd57aa3518adb4bc9b1213cc572a5b81f935..0515d1071324d82c14be4b9e97c8a583
|
||||
public boolean isTraderLlama() {
|
||||
return true;
|
||||
diff --git a/net/minecraft/world/entity/animal/equine/ZombieHorse.java b/net/minecraft/world/entity/animal/equine/ZombieHorse.java
|
||||
index b770d3118452b0b7a362b1f541bb602f4d3cbcec..5b671d468698444569b1d97437d746d49c0db757 100644
|
||||
index 45bb4df25015568f0758095d9a309633bed520f3..63557a6c2b87e1ee4348cab61df5d900c2c1c48e 100644
|
||||
--- a/net/minecraft/world/entity/animal/equine/ZombieHorse.java
|
||||
+++ b/net/minecraft/world/entity/animal/equine/ZombieHorse.java
|
||||
@@ -95,6 +95,13 @@ public class ZombieHorse extends AbstractHorse {
|
||||
@@ -96,6 +96,13 @@ public class ZombieHorse extends AbstractHorse {
|
||||
}
|
||||
// Purpur end - Toggle for water sensitive mob damage
|
||||
|
||||
@@ -311,7 +311,7 @@ index 8655aae805f239cbd049065232293854b18c73cf..05de579a16726454034dc4a913161676
|
||||
public ItemStack getBucketItemStack() {
|
||||
return new ItemStack(Items.COD_BUCKET);
|
||||
diff --git a/net/minecraft/world/entity/animal/fish/Pufferfish.java b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||
index 4d21718441b0272774ec69e9b72a180fe417cbb0..ba648a0ac7c60ddd0f5fb5b327c887f58e79a2eb 100644
|
||||
index 414d79f9d1fbd9857c8baeb2888017d45f34f02b..681eb25e45cec76f21cea9f77efe71290bdb547a 100644
|
||||
--- a/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||
+++ b/net/minecraft/world/entity/animal/fish/Pufferfish.java
|
||||
@@ -73,6 +73,13 @@ public class Pufferfish extends AbstractFish {
|
||||
@@ -401,7 +401,7 @@ index e5f5bc2c4b4f36e0e911b2c5ef67ef6e0d4cd0b1..64916356de4b9981e04c5befef15b067
|
||||
protected Brain.Provider<Goat> brainProvider() {
|
||||
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
|
||||
diff --git a/net/minecraft/world/entity/animal/golem/CopperGolem.java b/net/minecraft/world/entity/animal/golem/CopperGolem.java
|
||||
index 2d0ce5d420f88a95eda34a3fe81c815999bde300..4f92ac01a6d362a7ef748b74b75773575970859f 100644
|
||||
index e143db15040f8d5be5d07e04a41b7afaf42b4331..493d1678592bce78a15adeb4c9435fdc8e9dab8a 100644
|
||||
--- a/net/minecraft/world/entity/animal/golem/CopperGolem.java
|
||||
+++ b/net/minecraft/world/entity/animal/golem/CopperGolem.java
|
||||
@@ -147,6 +147,13 @@ public class CopperGolem extends AbstractGolem implements ContainerUser, Shearab
|
||||
@@ -437,7 +437,7 @@ index d31c1f1b681922ca8f1657ffa333e8a6794e619f..ddde4297b77d174034300165b591a224
|
||||
protected void registerGoals() {
|
||||
if (this.level().purpurConfig.ironGolemPoppyCalm) this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.ReceiveFlower(this)); // Purpur - Iron golem calm anger options
|
||||
diff --git a/net/minecraft/world/entity/animal/golem/SnowGolem.java b/net/minecraft/world/entity/animal/golem/SnowGolem.java
|
||||
index 0fe7f18390490ccf4e944ac3378150ebcc53991d..846b1a064398b455dbb2f05521870b4519edd5b8 100644
|
||||
index 94d319a8fba3a437fb55aa7daaaba0c5c9acbb3b..c37c999671955eeaff0b145a890a512c78d642a8 100644
|
||||
--- a/net/minecraft/world/entity/animal/golem/SnowGolem.java
|
||||
+++ b/net/minecraft/world/entity/animal/golem/SnowGolem.java
|
||||
@@ -87,6 +87,13 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -491,10 +491,10 @@ index 98199869b70c7c0f2b744ac74961c77d473617ca..7c4467933061f097425d6c82188a65fd
|
||||
protected Brain.Provider<Nautilus> brainProvider() {
|
||||
return NautilusAi.brainProvider();
|
||||
diff --git a/net/minecraft/world/entity/animal/nautilus/ZombieNautilus.java b/net/minecraft/world/entity/animal/nautilus/ZombieNautilus.java
|
||||
index 94383c5020b6631203ddc4e0a58a222729ffe9a2..7e4d005053e6812f329ab7ac1f252c547d4c9a12 100644
|
||||
index 7dd933dd38fc50e870bc74e5a54e2b50a85fa6f3..51d3a5f0aec8794cfd1ccefffea9947b0e49e693 100644
|
||||
--- a/net/minecraft/world/entity/animal/nautilus/ZombieNautilus.java
|
||||
+++ b/net/minecraft/world/entity/animal/nautilus/ZombieNautilus.java
|
||||
@@ -61,6 +61,13 @@ public class ZombieNautilus extends AbstractNautilus {
|
||||
@@ -62,6 +62,13 @@ public class ZombieNautilus extends AbstractNautilus {
|
||||
}
|
||||
// Purpur end - Make entity breeding times configurable
|
||||
|
||||
@@ -689,7 +689,7 @@ index 20f945ee06bcdb4736e6d3a8b20a5cbd3d79df0f..7fbe841818d08fd930f7ce405e84e5ed
|
||||
protected void registerGoals() {
|
||||
this.goalSelector.addGoal(1, new FloatGoal(this));
|
||||
diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||
index ef6dcc8183d9963d1e683f2cc74fec6443d175a9..fe4362040da72b51c14b3c65f75fe8a72757bab3 100644
|
||||
index ebbefa6ed794b73d7deef86894a81e2b6edbfbed..eb6dfc7e765616fd26f7a22843e646933f6e933b 100644
|
||||
--- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||
+++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||
@@ -228,6 +228,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
|
||||
@@ -779,7 +779,7 @@ index 47c621f01658f3392b58f3f5c1f31bd539f63dd6..c90a955b14ae10037f31c7e9b8a86df3
|
||||
protected void registerGoals() {
|
||||
this.goalSelector.addGoal(0, new FloatGoal(this));
|
||||
diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
|
||||
index c79c689cb99ad2a6cab88cf8b583ff0f9e91b115..4a778ad22f92e3fd95665a9b40ae932b427bac16 100644
|
||||
index b5e620d62702e3330f5ced19f1baeb82bdc801ec..972006a17c887f9380b1549de8a47e4d265e6e69 100644
|
||||
--- a/net/minecraft/world/entity/monster/Endermite.java
|
||||
+++ b/net/minecraft/world/entity/monster/Endermite.java
|
||||
@@ -79,6 +79,13 @@ public class Endermite extends Monster {
|
||||
@@ -923,7 +923,7 @@ index 0a5a6f23cd8e4317db4e7c0ba8883e99f3aff148..2b73382e5bcf47da483ea88e2eae480e
|
||||
protected void registerGoals() {
|
||||
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
|
||||
diff --git a/net/minecraft/world/entity/monster/Silverfish.java b/net/minecraft/world/entity/monster/Silverfish.java
|
||||
index 1692e7c93234506e22039da071e9c8e8a8567495..81976287402a701e3ef12c474cb68eb602cc2951 100644
|
||||
index c64509a5027de1369bde610feba7a39aa5b404fd..ba80f86980b6789bf944a4350b6f89d644cc283d 100644
|
||||
--- a/net/minecraft/world/entity/monster/Silverfish.java
|
||||
+++ b/net/minecraft/world/entity/monster/Silverfish.java
|
||||
@@ -72,6 +72,13 @@ public class Silverfish extends Monster {
|
||||
@@ -1283,7 +1283,7 @@ index 31b91dbc3f3e1875fbe6750bb815514686d14f7f..ef289dd3fe0be980c200affb0b84a106
|
||||
public boolean isSunSensitive() {
|
||||
return this.shouldBurnInDay; // Purpur - moved to LivingEntity; keep methods for ABI compatibility - API for any mob to burn daylight
|
||||
diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||
index d32a831ba76f65c4719c2672ffaec81a861cc7e6..f14fc03577a94dc6bd6e536e819a32c2d6144f02 100644
|
||||
index 7a26b05c15d23eb84e34d02905b3d5c12958c034..d59cb41554c3b89736eab20623c0791e1cc57fb2 100644
|
||||
--- a/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||
+++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
|
||||
@@ -150,6 +150,13 @@ public class Zombie extends Monster {
|
||||
@@ -1301,7 +1301,7 @@ index d32a831ba76f65c4719c2672ffaec81a861cc7e6..f14fc03577a94dc6bd6e536e819a32c2
|
||||
protected void registerGoals() {
|
||||
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
|
||||
diff --git a/net/minecraft/world/entity/monster/zombie/ZombieVillager.java b/net/minecraft/world/entity/monster/zombie/ZombieVillager.java
|
||||
index 3da4f757d879f8b855c5d36688f1f5dd50fc88a0..a9a04a4c9cedf33b68c99b2aec12289e63fa156b 100644
|
||||
index df9682cacc2913aaf51b3afbd86bbc080ab8bde0..04e1401b5a1edfe7370fa31fee67f5ad8819e41f 100644
|
||||
--- a/net/minecraft/world/entity/monster/zombie/ZombieVillager.java
|
||||
+++ b/net/minecraft/world/entity/monster/zombie/ZombieVillager.java
|
||||
@@ -138,6 +138,13 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
|
||||
|
||||
Reference in New Issue
Block a user