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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
fb4ff200f4 Use isSensitiveToWater in nerfed check for water-sensitive mobs (#7236)
cee7e0df01 Fix soul speed particles with hide-itemmeta enabled (#7239)
This commit is contained in:
BillyGalbreath
2022-01-01 18:16:15 -06:00
parent 12e0430097
commit 4185c7b462
5 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,19 +20,6 @@ index ca2bf36120ba09ed27ad7b1064431f9feffa3420..2feec97ffe62cfe063085e3767937e8a
// Purpur end
@Override
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index aa0b3e5ce098660cea74d3703cdd3106d6b26be4..d2049c5d4cf2dc6469450b6ee83961adafa7736d 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -868,7 +868,7 @@ public abstract class Mob extends LivingEntity {
if (goalFloat.canUse()) goalFloat.tick();
this.getJumpControl().tick();
}
- if ((this instanceof net.minecraft.world.entity.monster.Blaze || this instanceof net.minecraft.world.entity.monster.EnderMan) && isInWaterRainOrBubble()) {
+ if (isSensitiveToWater() && isInWaterRainOrBubble()) { // Purpur
hurt(DamageSource.DROWN, 1.0F);
}
return;
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index 743b5d483a230d56207a8864b5abab06d7c68e16..ef5cd71dcbaa4f86977fe9ae76042c49c144da9c 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java