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

Implement limited water

Browse Source
This commit is contained in:
Encode42
2021-09-29 14:50:07 -04:00
parent 92a00b8bf3
commit 5a724c0894
68 changed files with 316 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,10 +70,10 @@ 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 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a583a901f1 100644
index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..5e20818965afd3e0f93d7901727cbf97394d2a0a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -647,6 +647,7 @@ public class PurpurWorldConfig {
@@ -654,6 +654,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -657,6 +658,7 @@ public class PurpurWorldConfig {
@@ -664,6 +665,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
}
public boolean catRidable = false;
@@ -879,6 +881,7 @@ public class PurpurWorldConfig {
@@ -886,6 +888,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -891,6 +894,7 @@ public class PurpurWorldConfig {
@@ -898,6 +901,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 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
}
public boolean endermiteRidable = false;
@@ -1576,6 +1580,7 @@ public class PurpurWorldConfig {
@@ -1583,6 +1587,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1593,6 +1598,7 @@ public class PurpurWorldConfig {
@@ -1600,6 +1605,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 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
}
public boolean squidRidable = false;
@@ -1646,6 +1652,7 @@ public class PurpurWorldConfig {
@@ -1653,6 +1659,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a5
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1657,6 +1664,7 @@ public class PurpurWorldConfig {
@@ -1664,6 +1671,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);