mirror of
https://github.com/BX-Team/DivineMC.git
synced 2025-12-19 14:59:25 +00:00
109c57a637
* start 1.21.6 update * change workflow * apply some patches * set experimental to true * some compile fixes * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@5d3463aa Updated Upstream (Paper) * remove data converter for 1.21.6; move clumps to unapplied * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly * Update upstream * Update upstream * update to 1.21.6-pre4 * update patches * fix compile * set readme version to 1.21.6 * Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@439f15db Updated Upstream (Paper) PurpurMC/Purpur@46a28b93 [ci/skip] update version in README
91 lines
6.3 KiB
Diff
91 lines
6.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
|
|
Date: Sun, 23 Mar 2025 01:23:42 +0300
|
|
Subject: [PATCH] Configurable movement speed for entities
|
|
|
|
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
index 1e5f301d61da14c93b1cce4ceb3a3b2954435a80..e22d42be00677804c5548e9d9d6dd880a652f93b 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
|
@@ -1641,6 +1641,7 @@ public class PurpurWorldConfig {
|
|
public boolean drownedTakeDamageFromWater = false;
|
|
public boolean drownedBreakDoors = false;
|
|
public boolean drownedAlwaysDropExp = false;
|
|
+ public double drownedMovementSpeed = 0.23F; // DivineMC - Configurable movement speed for entities
|
|
private void drownedSettings() {
|
|
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
|
|
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
|
|
@@ -1659,6 +1660,7 @@ public class PurpurWorldConfig {
|
|
drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
|
|
drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors);
|
|
drownedAlwaysDropExp = getBoolean("mobs.drowned.always-drop-exp", drownedAlwaysDropExp);
|
|
+ drownedMovementSpeed = getDouble("mobs.drowned.movement-speed", drownedMovementSpeed); // DivineMC - Configurable movement speed for entities
|
|
}
|
|
|
|
public boolean elderGuardianRidable = false;
|
|
@@ -2086,6 +2088,7 @@ public class PurpurWorldConfig {
|
|
public boolean huskJockeyTryExistingChickens = true;
|
|
public boolean huskTakeDamageFromWater = false;
|
|
public boolean huskAlwaysDropExp = false;
|
|
+ public double huskMovementSpeed = 0.23F; // DivineMC - Configurable movement speed for entities
|
|
private void huskSettings() {
|
|
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
|
|
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
|
|
@@ -2103,6 +2106,7 @@ public class PurpurWorldConfig {
|
|
huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
|
|
huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater);
|
|
huskAlwaysDropExp = getBoolean("mobs.husk.always-drop-exp", huskAlwaysDropExp);
|
|
+ huskMovementSpeed = getDouble("mobs.husk.movement-speed", huskMovementSpeed); // DivineMC - Configurable movement speed for entities
|
|
}
|
|
|
|
public boolean illusionerRidable = false;
|
|
@@ -3494,6 +3498,7 @@ public class PurpurWorldConfig {
|
|
public boolean zombieTakeDamageFromWater = false;
|
|
public boolean zombieAlwaysDropExp = false;
|
|
public double zombieHeadVisibilityPercent = 0.5D;
|
|
+ public double zombieMovementSpeed = 0.23F; // DivineMC - Configurable movement speed for entities
|
|
private void zombieSettings() {
|
|
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
|
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
|
@@ -3519,6 +3524,7 @@ public class PurpurWorldConfig {
|
|
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
|
|
zombieAlwaysDropExp = getBoolean("mobs.zombie.always-drop-exp", zombieAlwaysDropExp);
|
|
zombieHeadVisibilityPercent = getDouble("mobs.zombie.head-visibility-percent", zombieHeadVisibilityPercent);
|
|
+ zombieMovementSpeed = getDouble("mobs.zombie.movement-speed", zombieMovementSpeed); // DivineMC - Configurable movement speed for entities
|
|
}
|
|
|
|
public boolean zombieHorseRidable = false;
|
|
@@ -3568,6 +3574,7 @@ public class PurpurWorldConfig {
|
|
public int zombieVillagerCuringTimeMax = 6000;
|
|
public boolean zombieVillagerCureEnabled = true;
|
|
public boolean zombieVillagerAlwaysDropExp = false;
|
|
+ public double zombieVillagerMovementSpeed = 0.23F; // DivineMC - Configurable movement speed for entities
|
|
private void zombieVillagerSettings() {
|
|
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
|
|
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
|
|
@@ -3588,6 +3595,7 @@ public class PurpurWorldConfig {
|
|
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
|
|
zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
|
|
zombieVillagerAlwaysDropExp = getBoolean("mobs.zombie_villager.always-drop-exp", zombieVillagerAlwaysDropExp);
|
|
+ zombieVillagerMovementSpeed = getDouble("mobs.zombie_villager.movement-speed", zombieVillagerMovementSpeed); // DivineMC - Configurable movement speed for entities
|
|
}
|
|
|
|
public boolean zombifiedPiglinRidable = false;
|
|
@@ -3602,6 +3610,7 @@ public class PurpurWorldConfig {
|
|
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = false;
|
|
public boolean zombifiedPiglinTakeDamageFromWater = false;
|
|
public boolean zombifiedPiglinAlwaysDropExp = false;
|
|
+ public double zombifiedPiglinMovementSpeed = 0.23F; // DivineMC - Configurable movement speed for entities
|
|
private void zombifiedPiglinSettings() {
|
|
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
|
|
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
|
|
@@ -3623,6 +3632,7 @@ public class PurpurWorldConfig {
|
|
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
|
|
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);
|
|
zombifiedPiglinAlwaysDropExp = getBoolean("mobs.zombified_piglin.always-drop-exp", zombifiedPiglinAlwaysDropExp);
|
|
+ zombifiedPiglinMovementSpeed = getDouble("mobs.zombified_piglin.movement-speed", zombifiedPiglinMovementSpeed); // DivineMC - Configurable movement speed for entities
|
|
}
|
|
|
|
public float hungerStarvationDamage = 1.0F;
|