Add water damage to all mobs (#703)

Co-authored-by: SPh <sph@sphnet.in>
This commit is contained in:
granny
2021-10-13 14:51:10 -07:00
committed by GitHub
parent 32fc651f97
commit 3aa3404fb7
35 changed files with 2394 additions and 250 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add back player spawned endermite API
diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
index d9e2bc9d37968430910c8de33390004ba5db22a6..1578a8196f860995370a1b8938b6d71040f5d3a9 100644
index 680a9cfc79c7b9d012f68142980ff32b9fb9f228..aeb46595e663f8584d3ef45d92420d915dc52e71 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
@@ -30,6 +30,7 @@ import net.minecraft.world.level.block.state.BlockState;
@@ -16,9 +16,9 @@ index d9e2bc9d37968430910c8de33390004ba5db22a6..1578a8196f860995370a1b8938b6d710
public Endermite(EntityType<? extends Endermite> type, Level world) {
super(type, world);
@@ -51,6 +52,14 @@ public class Endermite extends Monster {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.endermiteMaxHealth);
@@ -56,6 +57,14 @@ public class Endermite extends Monster {
public boolean isSensitiveToWater() {
return this.level.purpurConfig.endermiteTakeDamageFromWater;
}
+
+ public boolean isPlayerSpawned() {
@@ -31,7 +31,7 @@ index d9e2bc9d37968430910c8de33390004ba5db22a6..1578a8196f860995370a1b8938b6d710
// Purpur end
@Override
@@ -104,12 +113,14 @@ public class Endermite extends Monster {
@@ -109,12 +118,14 @@ public class Endermite extends Monster {
public void readAdditionalSaveData(CompoundTag nbt) {
super.readAdditionalSaveData(nbt);
this.life = nbt.getInt("Lifetime");
@@ -47,7 +47,7 @@ index d9e2bc9d37968430910c8de33390004ba5db22a6..1578a8196f860995370a1b8938b6d710
@Override
diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
index c2db9485e69b9679a33a57bc84cf2c76c1de2a42..6e4cffa397d07c9c0910f2a1ec0fb8bf04a1b6ba 100644
index 723b1ed5078084b7f85424f66e4f7b314fc05dda..a2109b4f6705b726ac2c4a8eb639e9c515752b8c 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
@@ -72,6 +72,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {