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

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

View File

@@ -70,10 +70,10 @@ index b3928617f732b49cfc124e9bdb879110413defd7..1c6d29a30df66e9971cd50e264bb4455
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc34f77d64f 100644
index 0727c7755f81ac1b0f29f7d874892b5ad32c5f53..ddf51a9e9771e4c9a40751d9b860ea76ad5648d8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -614,6 +614,7 @@ public class PurpurWorldConfig {
@@ -616,6 +616,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -624,6 +625,7 @@ public class PurpurWorldConfig {
@@ -626,6 +627,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
}
public boolean catRidable = false;
@@ -840,6 +842,7 @@ public class PurpurWorldConfig {
@@ -842,6 +844,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -852,6 +855,7 @@ public class PurpurWorldConfig {
@@ -854,6 +857,7 @@ public class PurpurWorldConfig {
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing);
@@ -105,7 +105,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
}
public boolean endermiteRidable = false;
@@ -1537,6 +1541,7 @@ public class PurpurWorldConfig {
@@ -1539,6 +1543,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1554,6 +1559,7 @@ public class PurpurWorldConfig {
@@ -1556,6 +1561,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
@@ -121,7 +121,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
}
public boolean squidRidable = false;
@@ -1607,6 +1613,7 @@ public class PurpurWorldConfig {
@@ -1609,6 +1615,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1618,6 +1625,7 @@ public class PurpurWorldConfig {
@@ -1620,6 +1627,7 @@ public class PurpurWorldConfig {
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);