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

add default cat collar color option

Browse Source
This commit is contained in:
granny
2021-08-12 14:43:21 -07:00
parent 22c86b0990
commit 158ae61463
28 changed files with 155 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0154-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -70,7 +70,7 @@ index 66dab9b4e5ae05deeae11c8588a0b855d8847bdc..19753a1855b11f8cdc9fb77e8d9079bb
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c3933b09b8af 100644
index 2bc1ae856fde1965bbab69d541f3544d5e23b095..eb50da9c77637e14b3cab7e18c591f70f679e8e3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -634,6 +634,7 @@ public class PurpurWorldConfig {
@@ -89,7 +89,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
}
public boolean catRidable = false;
@@ -860,6 +862,7 @@ public class PurpurWorldConfig {
@@ -866,6 +868,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -872,6 +875,7 @@ public class PurpurWorldConfig {
@@ -878,6 +881,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 b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
}
public boolean endermiteRidable = false;
@@ -1557,6 +1561,7 @@ public class PurpurWorldConfig {
@@ -1563,6 +1567,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1574,6 +1579,7 @@ public class PurpurWorldConfig {
@@ -1580,6 +1585,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 b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
}
public boolean squidRidable = false;
@@ -1627,6 +1633,7 @@ public class PurpurWorldConfig {
@@ -1633,6 +1639,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index b578c89ed02b093e329ba93775a3552e5a568883..8e3d7bb364f9581dd27145672c87c393
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1638,6 +1645,7 @@ public class PurpurWorldConfig {
@@ -1644,6 +1651,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);