phantom size; slime/magmacube/phantom attack_damage

This commit is contained in:
BillyGalbreath
2022-01-17 21:38:01 -06:00
parent 0242f72ba9
commit 930084af05
188 changed files with 1086 additions and 1001 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Mob head visibility percent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index dcadf213c929c693ee60666993288ef09988e62c..233b8e3db8917ab46e29b04e46b5fda6fcd92a20 100644
index e44b0c3704ca6b7609f6638e43aa8abe1939bfd8..b23c78fe2ad93a88378af90563e90b963f3f4322 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -990,9 +990,17 @@ public abstract class LivingEntity extends Entity {
@@ -29,10 +29,10 @@ index dcadf213c929c693ee60666993288ef09988e62c..233b8e3db8917ab46e29b04e46b5fda6
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a15ecffbb7285668b3c317ec8dae79b5fba92145..3bd820de8f7ddf74f4e0f606265f33833134e977 100644
index 0318508770b956b9278466e6f2d1f724a6f5fd70..f73df2c3cb5c15bf409804de9da14098de355822 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1236,6 +1236,7 @@ public class PurpurWorldConfig {
@@ -1237,6 +1237,7 @@ public class PurpurWorldConfig {
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
public boolean creeperAlwaysDropExp = false;
@@ -40,7 +40,7 @@ index a15ecffbb7285668b3c317ec8dae79b5fba92145..3bd820de8f7ddf74f4e0f606265f3383
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1252,6 +1253,7 @@ public class PurpurWorldConfig {
@@ -1253,6 +1254,7 @@ public class PurpurWorldConfig {
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
creeperAlwaysDropExp = getBoolean("mobs.creeper.always-drop-exp", creeperAlwaysDropExp);
@@ -48,7 +48,7 @@ index a15ecffbb7285668b3c317ec8dae79b5fba92145..3bd820de8f7ddf74f4e0f606265f3383
}
public boolean dolphinRidable = false;
@@ -2223,6 +2225,7 @@ public class PurpurWorldConfig {
@@ -2240,6 +2242,7 @@ public class PurpurWorldConfig {
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
public boolean skeletonAlwaysDropExp = false;
@@ -56,7 +56,7 @@ index a15ecffbb7285668b3c317ec8dae79b5fba92145..3bd820de8f7ddf74f4e0f606265f3383
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2234,6 +2237,7 @@ public class PurpurWorldConfig {
@@ -2251,6 +2254,7 @@ public class PurpurWorldConfig {
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
skeletonAlwaysDropExp = getBoolean("mobs.skeleton.always-drop-exp", skeletonAlwaysDropExp);
@@ -64,7 +64,7 @@ index a15ecffbb7285668b3c317ec8dae79b5fba92145..3bd820de8f7ddf74f4e0f606265f3383
}
public boolean skeletonHorseRidableInWater = true;
@@ -2706,6 +2710,7 @@ public class PurpurWorldConfig {
@@ -2727,6 +2731,7 @@ public class PurpurWorldConfig {
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
public boolean zombieAlwaysDropExp = false;
@@ -72,7 +72,7 @@ index a15ecffbb7285668b3c317ec8dae79b5fba92145..3bd820de8f7ddf74f4e0f606265f3383
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2723,6 +2728,7 @@ public class PurpurWorldConfig {
@@ -2744,6 +2749,7 @@ public class PurpurWorldConfig {
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);