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

fix build issue

Browse Source
This commit is contained in:
Ben Kerllenevich
2023-06-11 22:04:37 -04:00
parent 866df4ad0e
commit 788c14f02c
77 changed files with 586 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1504,10 +1504,10 @@ index d434b96b878652190fac4e2882b7b7373febbbd5..62deb4a443bf65655d2a4310c0dd9f40
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b548fe6b1f 100644
index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..049658a2c939255003a8b32a18b67bb153243b23 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,42 +114,94 @@ public class PurpurWorldConfig {
@@ -114,99 +114,190 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public boolean axolotlControllable = true;
@@ -1584,15 +1584,17 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
+ set("mobs.blaze.attributes.max_health", oldValue);
+ }
+ blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
+ }
+
}
public boolean camelRidableInWater = false;
+ 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() {
private void camelSettings() {
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
+ camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
+ camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
+ camelJumpStrengthMin = getDouble("mobs.camel.attributes.jump_strength.min", camelJumpStrengthMin);
@@ -1601,8 +1603,6 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
+ camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
}
public boolean camelRidableInWater = false;
@@ -160,53 +212,95 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
public boolean catRidableInWater = true;
public boolean catControllable = true;
@@ -1698,7 +1698,7 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
}
public boolean dolphinRidable = false;
@@ -214,80 +308,161 @@ public class PurpurWorldConfig {
@@ -214,80 +305,161 @@ public class PurpurWorldConfig {
public int dolphinSpitCooldown = 20;
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
@@ -1860,7 +1860,7 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
}
public boolean frogRidable = false;
@@ -305,147 +480,316 @@ public class PurpurWorldConfig {
@@ -305,147 +477,316 @@ public class PurpurWorldConfig {
public boolean ghastRidableInWater = true;
public boolean ghastControllable = true;
public double ghastMaxY = 320D;
@@ -2177,7 +2177,7 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
}
public boolean phantomRidable = false;
@@ -455,6 +799,10 @@ public class PurpurWorldConfig {
@@ -455,6 +796,10 @@ public class PurpurWorldConfig {
public float phantomFlameDamage = 1.0F;
public int phantomFlameFireTime = 8;
public boolean phantomAllowGriefing = false;
@@ -2188,7 +2188,7 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -463,189 +811,361 @@ public class PurpurWorldConfig {
@@ -463,189 +808,361 @@ public class PurpurWorldConfig {
phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -2550,7 +2550,7 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
}
public boolean tadpoleRidable = false;
@@ -660,64 +1180,125 @@ public class PurpurWorldConfig {
@@ -660,64 +1177,125 @@ public class PurpurWorldConfig {
public boolean traderLlamaRidable = false;
public boolean traderLlamaRidableInWater = false;
public boolean traderLlamaControllable = true;
@@ -2676,7 +2676,7 @@ index 3ad11a5c1e661d7a8752f0f7682e5eee98aa0c0a..e89b221674472a3f0f1529f1f54f54b5
}
public boolean wardenRidable = false;
@@ -732,81 +1313,165 @@ public class PurpurWorldConfig {
@@ -732,81 +1310,165 @@ public class PurpurWorldConfig {
public boolean witchRidable = false;
public boolean witchRidableInWater = true;
public boolean witchControllable = true;