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

[ci-skip] clean up TODOs in patches

Browse Source
This commit is contained in:
granny
2023-03-20 20:04:44 -07:00
parent eb1479754d
commit 34464812aa
7 changed files with 108 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
patches/server/0007-Configurable-entity-base-attributes.patch
View File

@@ -1220,7 +1220,7 @@ index 774da46962f70e73d31ea523eb5bfc286f38856d..d2324e2dbd72fcd5a8ab562bc3b6e530
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5ea988c1e 100644
index de0b2d79435f55f35f1063094ac9c674b186fc79..4a831f434f27a117fdcd1364a18deb026d1638e4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -112,94 +112,181 @@ public class PurpurWorldConfig {
@@ -1295,12 +1295,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
+ blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
+ }
+
+ public double camelMaxHealthMin = 32.0D; // TODO: re-implement
+ public double camelMaxHealthMax = 32.0D; // TODO: re-implement
+ public double camelJumpStrengthMin = 0.42D; // TODO: re-implement
+ public double camelJumpStrengthMax = 0.42D; // TODO: re-implement
+ public double camelMovementSpeedMin = 0.09D; // TODO: re-implement
+ public double camelMovementSpeedMax = 0.09D; // TODO: re-implement
+ public double camelMaxHealthMin = 32.0D;
+ public double camelMaxHealthMax = 32.0D;
+ public double camelJumpStrengthMin = 0.42D;
+ public double camelJumpStrengthMax = 0.42D;
+ public double camelMovementSpeedMin = 0.09D;
+ public double camelMovementSpeedMax = 0.09D;
+ private void camelSettings() {
+ camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
+ camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
@@ -1425,12 +1425,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
}
public boolean donkeyRidableInWater = false;
+ public double donkeyMaxHealthMin = 15.0D; // TODO: re-implement
+ public double donkeyMaxHealthMax = 30.0D; // TODO: re-implement
+ public double donkeyJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double donkeyJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double donkeyMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double donkeyMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double donkeyMaxHealthMin = 15.0D;
+ public double donkeyMaxHealthMax = 30.0D;
+ public double donkeyJumpStrengthMin = 0.5D;
+ public double donkeyJumpStrengthMax = 0.5D;
+ public double donkeyMovementSpeedMin = 0.175D;
+ public double donkeyMovementSpeedMax = 0.175D;
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
+ if (PurpurConfig.version < 10) {
@@ -1660,12 +1660,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
}
public boolean horseRidableInWater = false;
+ public double horseMaxHealthMin = 15.0D; // TODO: re-implement
+ public double horseMaxHealthMax = 30.0D; // TODO: re-implement
+ public double horseJumpStrengthMin = 0.4D; // TODO: re-implement
+ public double horseJumpStrengthMax = 1.0D; // TODO: re-implement
+ public double horseMovementSpeedMin = 0.1125D; // TODO: re-implement
+ public double horseMovementSpeedMax = 0.3375D; // TODO: re-implement
+ public double horseMaxHealthMin = 15.0D;
+ public double horseMaxHealthMax = 30.0D;
+ public double horseJumpStrengthMin = 0.4D;
+ public double horseJumpStrengthMax = 1.0D;
+ public double horseMovementSpeedMin = 0.1125D;
+ public double horseMovementSpeedMax = 0.3375D;
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
+ if (PurpurConfig.version < 10) {
@@ -1746,12 +1746,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean llamaRidable = false;
public boolean llamaRidableInWater = false;
public boolean llamaControllable = true;
+ public double llamaMaxHealthMin = 15.0D; // TODO: re-implement
+ public double llamaMaxHealthMax = 30.0D; // TODO: re-implement
+ public double llamaJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double llamaJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double llamaMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double llamaMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double llamaMaxHealthMin = 15.0D;
+ public double llamaMaxHealthMax = 30.0D;
+ public double llamaJumpStrengthMin = 0.5D;
+ public double llamaJumpStrengthMax = 0.5D;
+ public double llamaMovementSpeedMin = 0.175D;
+ public double llamaMovementSpeedMax = 0.175D;
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1810,12 +1810,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
}
public boolean muleRidableInWater = false;
+ public double muleMaxHealthMin = 15.0D; // TODO: re-implement
+ public double muleMaxHealthMax = 30.0D; // TODO: re-implement
+ public double muleJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double muleJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double muleMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double muleMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double muleMaxHealthMin = 15.0D;
+ public double muleMaxHealthMax = 30.0D;
+ public double muleJumpStrengthMin = 0.5D;
+ public double muleJumpStrengthMax = 0.5D;
+ public double muleMovementSpeedMin = 0.175D;
+ public double muleMovementSpeedMax = 0.175D;
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
+ if (PurpurConfig.version < 10) {
@@ -2120,12 +2120,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean skeletonHorseRidableInWater = true;
public boolean skeletonHorseCanSwim = false;
+ public double skeletonHorseMaxHealthMin = 15.0D; // TODO: re-implement
+ public double skeletonHorseMaxHealthMax = 15.0D; // TODO: re-implement
+ public double skeletonHorseJumpStrengthMin = 0.4D; // TODO: re-implement
+ public double skeletonHorseJumpStrengthMax = 1.0D; // TODO: re-implement
+ public double skeletonHorseMovementSpeedMin = 0.2D; // TODO: re-implement
+ public double skeletonHorseMovementSpeedMax = 0.2D; // TODO: re-implement
+ public double skeletonHorseMaxHealthMin = 15.0D;
+ public double skeletonHorseMaxHealthMax = 15.0D;
+ public double skeletonHorseJumpStrengthMin = 0.4D;
+ public double skeletonHorseJumpStrengthMax = 1.0D;
+ public double skeletonHorseMovementSpeedMin = 0.2D;
+ public double skeletonHorseMovementSpeedMax = 0.2D;
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -2253,12 +2253,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
+ public double traderLlamaMaxHealthMin = 15.0D; // TODO: re-implement
+ public double traderLlamaMaxHealthMax = 30.0D; // TODO: re-implement
+ public double traderLlamaJumpStrengthMin = 0.5D; // TODO: re-implement
+ public double traderLlamaJumpStrengthMax = 0.5D; // TODO: re-implement
+ public double traderLlamaMovementSpeedMin = 0.175D; // TODO: re-implement
+ public double traderLlamaMovementSpeedMax = 0.175D; // TODO: re-implement
+ public double traderLlamaMaxHealthMin = 15.0D;
+ public double traderLlamaMaxHealthMax = 30.0D;
+ public double traderLlamaJumpStrengthMin = 0.5D;
+ public double traderLlamaJumpStrengthMax = 0.5D;
+ public double traderLlamaMovementSpeedMin = 0.175D;
+ public double traderLlamaMovementSpeedMax = 0.175D;
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -2482,12 +2482,12 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..267833342e74cf71b5199d261620ace5
public boolean zombieHorseRidableInWater = false;
public boolean zombieHorseCanSwim = false;
+ public double zombieHorseMaxHealthMin = 15.0D; // TODO: re-implement
+ public double zombieHorseMaxHealthMax = 15.0D; // TODO: re-implement
+ public double zombieHorseJumpStrengthMin = 0.4D; // TODO: re-implement
+ public double zombieHorseJumpStrengthMax = 1.0D; // TODO: re-implement
+ public double zombieHorseMovementSpeedMin = 0.2D; // TODO: re-implement
+ public double zombieHorseMovementSpeedMax = 0.2D; // TODO: re-implement
+ public double zombieHorseMaxHealthMin = 15.0D;
+ public double zombieHorseMaxHealthMax = 15.0D;
+ public double zombieHorseJumpStrengthMin = 0.4D;
+ public double zombieHorseJumpStrengthMax = 1.0D;
+ public double zombieHorseMovementSpeedMin = 0.2D;
+ public double zombieHorseMovementSpeedMax = 0.2D;
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);