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

Fix silk-touch spawners dropping xp and add config for minimal enchantment level (#454)

Browse Source
This commit is contained in:
Bierque Jason
2021-07-01 06:06:52 +02:00
committed by GitHub
parent 139f2f5d07
commit 247b99f433
112 changed files with 410 additions and 400 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 04d09123f70a192f1283c0d7e8a8254f3d30889a..43ef93d2c0c59e0d7021ee9aa2b44345
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb827e998a 100644
index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68b8cb8d03 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -506,6 +506,9 @@ public class PurpurWorldConfig {
@@ -508,6 +508,9 @@ public class PurpurWorldConfig {
public boolean drownedRidableInWater = false;
public double drownedMaxHealth = 20.0D;
public double drownedSpawnReinforcements = 0.1D;
@@ -180,7 +180,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -516,6 +519,9 @@ public class PurpurWorldConfig {
@@ -518,6 +521,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 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
}
public boolean elderGuardianRidable = false;
@@ -728,6 +734,9 @@ public class PurpurWorldConfig {
@@ -730,6 +736,9 @@ public class PurpurWorldConfig {
public boolean huskRidableInWater = false;
public double huskMaxHealth = 20.0D;
public double huskSpawnReinforcements = 0.1D;
@@ -200,7 +200,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -738,6 +747,9 @@ public class PurpurWorldConfig {
@@ -740,6 +749,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 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
}
public boolean illusionerRidable = false;
@@ -1440,6 +1452,9 @@ public class PurpurWorldConfig {
@@ -1442,6 +1454,9 @@ public class PurpurWorldConfig {
public boolean zombieRidableInWater = false;
public double zombieMaxHealth = 20.0D;
public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1450,6 +1465,9 @@ public class PurpurWorldConfig {
@@ -1452,6 +1467,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 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
}
public boolean zombieHorseRidableInWater = false;
@@ -1483,6 +1501,9 @@ public class PurpurWorldConfig {
@@ -1485,6 +1503,9 @@ public class PurpurWorldConfig {
public boolean zombieVillagerRidableInWater = false;
public double zombieVillagerMaxHealth = 20.0D;
public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1493,12 +1514,18 @@ public class PurpurWorldConfig {
@@ -1495,12 +1516,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 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1509,5 +1536,8 @@ public class PurpurWorldConfig {
@@ -1511,5 +1538,8 @@ public class PurpurWorldConfig {
}
zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);