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

Update silk touch patch to use minimessage

Browse Source
This commit is contained in:
William Blake Galbreath
2021-09-02 15:17:12 -05:00
parent 8c2e417757
commit c28262576c
174 changed files with 656 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0077-Configurable-jockey-options.patch
View File

@@ -167,10 +167,10 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e586f2592 100644
index 7eb78791f507dfc50ae70134fdfe161256f5ee16..e0733147d9976e42a06e262e54fef121ac583915 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -525,6 +525,9 @@ public class PurpurWorldConfig {
@@ -533,6 +533,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -535,6 +538,9 @@ public class PurpurWorldConfig {
@@ -543,6 +546,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
}
public boolean elderGuardianRidable = false;
@@ -747,6 +753,9 @@ public class PurpurWorldConfig {
@@ -755,6 +761,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -757,6 +766,9 @@ public class PurpurWorldConfig {
@@ -765,6 +774,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
}
public boolean illusionerRidable = false;
@@ -1457,6 +1469,9 @@ public class PurpurWorldConfig {
@@ -1465,6 +1477,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1467,6 +1482,9 @@ public class PurpurWorldConfig {
@@ -1475,6 +1490,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 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
}
public boolean zombieHorseRidableInWater = false;
@@ -1500,6 +1518,9 @@ public class PurpurWorldConfig {
@@ -1508,6 +1526,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1510,12 +1531,18 @@ public class PurpurWorldConfig {
@@ -1518,12 +1539,18 @@ public class PurpurWorldConfig {
}
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 2a1cc21584f9e9765d8c00766450c2fc6e49f35d..d2754ceb0d87dd844a5e325ee5a89b4e
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1526,5 +1553,8 @@ public class PurpurWorldConfig {
@@ -1534,5 +1561,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);