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

synchronize patches

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0064-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index 8f22bfcde4bb8ad73794f2b98b156113e5a2a6c9..3d61b27c23d90e87fdfc8c170eafc116
public void setPersistentAngerTarget(@Nullable UUID angryAt) {
this.persistentAngerTarget = angryAt;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277ea4a36c3 100644
index 2a64f26cd8db56bf522b1a9f6201164d188bd0b9..9d3c5867a8d54200e4a6e90ead9d003411a802c1 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -587,6 +587,9 @@ public class PurpurWorldConfig {
@@ -592,6 +592,9 @@ public class PurpurWorldConfig {
public boolean drownedControllable = true;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -598,6 +601,9 @@ public class PurpurWorldConfig {
@@ -603,6 +606,9 @@ public class PurpurWorldConfig {
}
drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth);
drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements);
@@ -190,7 +190,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
}
public boolean elderGuardianRidable = false;
@@ -846,6 +852,9 @@ public class PurpurWorldConfig {
@@ -851,6 +857,9 @@ public class PurpurWorldConfig {
public boolean huskControllable = true;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -857,6 +866,9 @@ public class PurpurWorldConfig {
@@ -862,6 +871,9 @@ public class PurpurWorldConfig {
}
huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth);
huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements);
@@ -210,7 +210,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
}
public boolean illusionerRidable = false;
@@ -1673,6 +1685,9 @@ public class PurpurWorldConfig {
@@ -1678,6 +1690,9 @@ public class PurpurWorldConfig {
public boolean zombieControllable = true;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1684,6 +1699,9 @@ public class PurpurWorldConfig {
@@ -1689,6 +1704,9 @@ public class PurpurWorldConfig {
}
zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
}
public boolean zombieHorseRidableInWater = false;
@@ -1718,6 +1736,9 @@ public class PurpurWorldConfig {
@@ -1723,6 +1741,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerControllable = true;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1729,6 +1750,9 @@ public class PurpurWorldConfig {
@@ -1734,6 +1755,9 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -250,7 +250,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
}
public boolean zombifiedPiglinRidable = false;
@@ -1736,6 +1760,9 @@ public class PurpurWorldConfig {
@@ -1741,6 +1765,9 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinControllable = true;
public double zombifiedPiglinMaxHealth = 20.0D;
public double zombifiedPiglinSpawnReinforcements = 0.0D;
@@ -260,7 +260,7 @@ index f69b94022b78cd9dad74858a90eb61904944e17e..1d9c99f3740cec7fb41602835cda3277
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1747,5 +1774,8 @@ public class PurpurWorldConfig {
@@ -1752,5 +1779,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);