synchronize patches

This commit is contained in:
granny
2023-06-09 05:07:46 -07:00
parent 9bed3af997
commit e4edcee766
113 changed files with 703 additions and 715 deletions

View File

@@ -1171,13 +1171,14 @@ index 4db19589d19d1a0e488ddd0b691e81152ac236e4..6250d2bd682ce3c421aeea598cf8ec90
protected void defineSynchedData() {
super.defineSynchedData();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index c74db4080ad3d726c4b5cb374e20e6df2a262d2f..91321bd00771cc70665a3e28eeba273b791eaa11 100644
index c74db4080ad3d726c4b5cb374e20e6df2a262d2f..c46406a46f05d275eefd548420fce1dab716c765 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -106,6 +106,37 @@ public class Slime extends Mob implements Enemy {
@@ -104,6 +104,37 @@ public class Slime extends Mob implements Enemy {
}
return true; // do not jump() in wasd controller, let vanilla controller handle
}
// Purpur end
+
+ protected String getMaxHealthEquation() {
+ return level().purpurConfig.slimeMaxHealth;
+ }
@@ -1208,10 +1209,9 @@ index c74db4080ad3d726c4b5cb374e20e6df2a262d2f..91321bd00771cc70665a3e28eeba273b
+ }
+ return value;
+ }
+
// Purpur end
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
@@ -133,9 +164,9 @@ public class Slime extends Mob implements Enemy {
this.entityData.set(Slime.ID_SIZE, j);
this.reapplyPosition();