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 #462 - also renamed option for clarity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-03 08:00:18 -05:00
parent 1ca029cdcc
commit c69c0bcadf
46 changed files with 225 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch
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 e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88e96c4a6b 100644
index e755455ebf9c10cabea88a7bab29d0da2189717e..caa8f3780b5c939d7b692d455cf5b8d9a6a9c903 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -623,6 +623,7 @@ public class PurpurWorldConfig {
@@ -629,6 +629,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -633,6 +634,7 @@ public class PurpurWorldConfig {
@@ -639,6 +640,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
}
public boolean catRidable = false;
@@ -849,6 +851,7 @@ public class PurpurWorldConfig {
@@ -855,6 +857,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -861,6 +864,7 @@ public class PurpurWorldConfig {
@@ -867,6 +870,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 e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
}
public boolean endermiteRidable = false;
@@ -1546,6 +1550,7 @@ public class PurpurWorldConfig {
@@ -1552,6 +1556,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1563,6 +1568,7 @@ public class PurpurWorldConfig {
@@ -1569,6 +1574,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 e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
}
public boolean squidRidable = false;
@@ -1616,6 +1622,7 @@ public class PurpurWorldConfig {
@@ -1622,6 +1628,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index e1aca2c5253f26125e1154e75c8c2cbcd98af496..5507cf137dfc3167efdb19a550148e88
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1627,6 +1634,7 @@ public class PurpurWorldConfig {
@@ -1633,6 +1640,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);