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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for water sensitive mob damage
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index a397a4bd2deb682d1465a305731cee0d911e64af..b057284fea2fc32e300183ee1db29173efa6d490 100644
index 713b80dde1f6cf3ba516513873c949a57047a566..9e144b0e3838b371d9fe6d146bc171f6e70e25b2 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -860,7 +860,7 @@ public abstract class Mob extends LivingEntity {
@@ -856,7 +856,7 @@ public abstract class Mob extends LivingEntity {
if (goalFloat.canUse()) goalFloat.tick();
this.getJumpControl().tick();
}
@@ -57,10 +57,10 @@ index 96ad40de21a4f00df15ec5c0c8c130566ac27cd1..3907b7cb559dabdd3cc347678d420712
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
index b3928617f732b49cfc124e9bdb879110413defd7..1c6d29a30df66e9971cd50e264bb4455cefe0e8a 100644
index 66dab9b4e5ae05deeae11c8588a0b855d8847bdc..19753a1855b11f8cdc9fb77e8d9079bbeb3c519b 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
@@ -407,7 +407,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -408,7 +408,7 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@Override
public boolean isSensitiveToWater() {
@@ -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 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611eac7399e 100644
index 26f6b0f31cbbedb20ac7660726c5244c33685954..157ebb6cb3bcaed9303dd1919d2335cca3df3b48 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 {
@@ -633,6 +633,7 @@ public class PurpurWorldConfig {
public boolean blazeRidableInWater = false;
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
@@ -81,7 +81,7 @@ index 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -644,6 +645,7 @@ public class PurpurWorldConfig {
@@ -643,6 +644,7 @@ public class PurpurWorldConfig {
set("mobs.blaze.attributes.max_health", oldValue);
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
@@ -89,7 +89,7 @@ index 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
}
public boolean catRidable = false;
@@ -860,6 +862,7 @@ public class PurpurWorldConfig {
@@ -859,6 +861,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -872,6 +875,7 @@ public class PurpurWorldConfig {
@@ -871,6 +874,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 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
}
public boolean endermiteRidable = false;
@@ -1557,6 +1561,7 @@ public class PurpurWorldConfig {
@@ -1556,6 +1560,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
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 {
@@ -1573,6 +1578,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 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
}
public boolean squidRidable = false;
@@ -1627,6 +1633,7 @@ public class PurpurWorldConfig {
@@ -1626,6 +1632,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index 6bd19d153fcdb59b144ed40e8493e4a9f4c0e523..20298204893a4fab0e3b1be36eca7611
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1638,6 +1645,7 @@ public class PurpurWorldConfig {
@@ -1637,6 +1644,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);