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

Resolve #286 - Add config and API for item immunity to lightning

Browse Source
This commit is contained in:
BillyGalbreath
2021-05-03 13:32:36 -05:00
parent a86555bb5d
commit 83665826a9
98 changed files with 362 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0167-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -83,10 +83,10 @@ index 5e4cc99a746d98231bbb71672fbc02431e4fab48..f52ae7446c16d5b8ac51bd2e12bb51d2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2177ef78f 100644
index 7b0babbd727421ecd05523eadbff3abb758fab6f..faa5df044857f19503b35bbcf7366ac13b2fa2a9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -619,6 +619,7 @@ public class PurpurWorldConfig {
@@ -629,6 +629,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -94,7 +94,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -629,6 +630,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);
@@ -102,7 +102,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
}
public boolean catRidable = false;
@@ -843,6 +845,7 @@ public class PurpurWorldConfig {
@@ -853,6 +855,7 @@ public class PurpurWorldConfig {
public boolean endermanBypassMobGriefing = false;
public boolean endermanDespawnEvenWithBlock = false;
public double endermanMaxHealth = 40.0D;
@@ -110,7 +110,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -855,6 +858,7 @@ public class PurpurWorldConfig {
@@ -865,6 +868,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
@@ -118,7 +118,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
}
public boolean endermiteRidable = false;
@@ -1544,6 +1548,7 @@ public class PurpurWorldConfig {
@@ -1554,6 +1558,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public double snowGolemMaxHealth = 4.0D;
@@ -126,7 +126,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1561,6 +1566,7 @@ public class PurpurWorldConfig {
@@ -1571,6 +1576,7 @@ public class PurpurWorldConfig {
set("mobs.snow_golem.attributes.max_health", oldValue);
}
snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth);
@@ -134,7 +134,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
}
public boolean squidRidable = false;
@@ -1614,6 +1620,7 @@ public class PurpurWorldConfig {
@@ -1624,6 +1630,7 @@ public class PurpurWorldConfig {
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
public double striderMaxHealth = 20.0D;
@@ -142,7 +142,7 @@ index bd81fcec811b65205f77ff3fa81ba649337e0046..7cdc7502649e24aefabedbe9965a15c2
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1625,6 +1632,7 @@ public class PurpurWorldConfig {
@@ -1635,6 +1642,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);