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

Fix #868

Browse Source
This commit is contained in:
BillyGalbreath
2022-01-25 17:31:31 -06:00
parent d3c6faa749
commit 414cf7d035
6 changed files with 94 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -37,9 +37,18 @@ index 1fbe37705556e62752be4719994e1cde96f3434d..f6b289cea5962ef56e5c9daa1122989b
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index a7dce3d3a0266bacd1883bfe8b47af79defcd95b..0c0c900d07d2869baa5fdd669ceecf4ad3477807 100644
index a7dce3d3a0266bacd1883bfe8b47af79defcd95b..8501fd8a512182c7e58894576b54ce16408825a6 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -177,7 +177,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
// Paper end
this.lookControl = new Bee.BeeLookControl(this);
this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, -1.0F);
- this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
+ if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
this.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 16.0F);
this.setPathfindingMalus(BlockPathTypes.COCOA, -1.0F);
this.setPathfindingMalus(BlockPathTypes.FENCE, -1.0F);
@@ -225,6 +225,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
public int getPurpurBreedTime() {
return this.level.purpurConfig.beeBreedingTicks;
@@ -578,9 +587,18 @@ index 99b901f1ee202213dae3ab1930342920bbfe3d7a..93a431247b28bcb8cc974f2dfafe1dab
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
index 1fc653194718eb4698450af5d1865a6da090c76d..8cebcc68839a510fee3ff085e9308f6d351f51e8 100644
index 1fc653194718eb4698450af5d1865a6da090c76d..081f9ff6edf17a1588649cc69f48b2f577ce809f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
@@ -33,7 +33,7 @@ public class Blaze extends Monster {
public Blaze(EntityType<? extends Blaze> type, Level world) {
super(type, world);
this.moveControl = new org.purpurmc.purpur.controller.FlyingWithSpacebarMoveControllerWASD(this, 0.3F); // Purpur
- this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
+ if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
this.setPathfindingMalus(BlockPathTypes.LAVA, 8.0F);
this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
@@ -143,7 +143,7 @@ public class Blaze extends Monster {
@Override
@@ -655,9 +673,18 @@ index 25fab7497a80a8fa65bd9cd9bdb0cd498f240bd1..2800594fea055d75268531d8ad3fef99
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 8f8a5db7231c1ec69ac8b94b16447321fc89618a..a02e04ed34de9d87066b202cf747f927b55cfb76 100644
index 8f8a5db7231c1ec69ac8b94b16447321fc89618a..eb0c73cb96e94079ac010c8ae4999206ad988cdf 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -85,7 +85,7 @@ public class EnderMan extends Monster implements NeutralMob {
public EnderMan(EntityType<? extends EnderMan> type, Level world) {
super(type, world);
this.maxUpStep = 1.0F;
- this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
+ if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
}
// Purpur start
@@ -298,7 +298,7 @@ public class EnderMan extends Monster implements NeutralMob {
@Override
@@ -796,7 +823,7 @@ index d4ce48a99fad5e9a26f8e057d91c712b8d8623b0..d5039d0a5e8a35cb7ce43792c909b21d
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index c01820307fa6d476402632d44b65ada164a5aded..18b0a62a7ae7cf2413c319f402672ef2a6ee415f 100644
index 5d9e6945ebdda73a77f048dfb91bfeb561e0eb5f..3122f7b826605f171bc1c88de89b358bd2e7118c 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -151,6 +151,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -940,9 +967,18 @@ index b54368f53d3cf87f35132f811f8a917999968c1e..4888502f99e0a9db246f9714a4d75348
public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
index cfa355d99d5f8aaefe4cf0c10805ef7b51a0224a..ead0c2c900fbfabef478b200e954d7388860249d 100644
index cfa355d99d5f8aaefe4cf0c10805ef7b51a0224a..a58800a7b06f662c7b3fc876ae78fb2880d3ddbc 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
@@ -91,7 +91,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
super(type, world);
this.steering = new ItemBasedSteering(this.entityData, Strider.DATA_BOOST_TIME, Strider.DATA_SADDLE_ID);
this.blocksBuilding = true;
- this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
+ if (isSensitiveToWater()) this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F); // Purpur
this.setPathfindingMalus(BlockPathTypes.LAVA, 0.0F);
this.setPathfindingMalus(BlockPathTypes.DANGER_FIRE, 0.0F);
this.setPathfindingMalus(BlockPathTypes.DAMAGE_FIRE, 0.0F);
@@ -413,7 +413,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@Override