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] Configurable damage settings for magma blocks
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5477f0294d27391edb1ea8fd36dbdc011392950a..ffe4024267f432c9eba37a6712e444e55c69799d 100644
index 3a3c0c9d1854e5784ca436f194ea59fe8939f0ab..c709099a06f6cb9313c7e99f3b66b463b31e751a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1051,7 +1051,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -31,10 +31,10 @@ index 96b4597101a7f3e98ce30bfc301e8ca1620d0fe4..d7845984b5077cdcd40d652c226d5d60
entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index fa95eb94413b51263a37a5d463181a7e174c582d..0d78700bde1000e43bf6633140fb4f53975308f5 100644
index 423f3c82e0ad1ee56b84fed9f919773386203a89..0367d18261ae85f6f38b92e29d38037835ab385f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -588,6 +588,13 @@ public class PurpurWorldConfig {
@@ -589,6 +589,13 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}