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

Rebase on latest Purpur (#230)

Browse Source
This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0168-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 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd9960f2c59b 100644
index a103dbcf9c91204b1993cc3d33fc726f2a9083fb..d28a19721a700f8fe706c90eab8452871dfd4788 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -571,6 +571,7 @@ public class PurpurWorldConfig {
@@ -583,6 +583,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -94,7 +94,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -581,6 +582,7 @@ public class PurpurWorldConfig {
@@ -593,6 +594,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -102,7 +102,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
}
public boolean catRidable = false;
@@ -795,6 +797,7 @@ public class PurpurWorldConfig {
@@ -807,6 +809,7 @@ public class PurpurWorldConfig {
public boolean endermanBypassMobGriefing = false;
public boolean endermanDespawnEvenWithBlock = false;
public double endermanMaxHealth = 40.0D;
@@ -110,7 +110,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -807,6 +810,7 @@ public class PurpurWorldConfig {
@@ -819,6 +822,7 @@ public class PurpurWorldConfig {
set("mobs.enderman.attributes.max_health", oldValue);
}
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
@@ -118,7 +118,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
}
public boolean endermiteRidable = false;
@@ -1494,6 +1498,7 @@ public class PurpurWorldConfig {
@@ -1506,6 +1510,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public double snowGolemMaxHealth = 4.0D;
@@ -126,7 +126,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1511,6 +1516,7 @@ public class PurpurWorldConfig {
@@ -1523,6 +1528,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 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
}
public boolean squidRidable = false;
@@ -1564,6 +1570,7 @@ public class PurpurWorldConfig {
@@ -1576,6 +1582,7 @@ public class PurpurWorldConfig {
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
public double striderMaxHealth = 20.0D;
@@ -142,7 +142,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1575,6 +1582,7 @@ public class PurpurWorldConfig {
@@ -1587,6 +1594,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);