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

Updated Upstream (Paper & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
06db5d08b0 Updated Upstream (Bukkit/CraftBukkit) (#6589)
810d200bb4 Improve interact distance check (#6591)

Airplane Changes:
8207533bdf Upstream
This commit is contained in:
William Blake Galbreath
2021-09-12 22:23:58 -05:00
parent acf2f845e4
commit 8bd08ceeea
53 changed files with 239 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0153-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 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb19248ca54af 100644
index 65a022cd14063f3f0692f92bb7a2147c748b0fb4..c0d056ee845f8de9e4832de98dec00a583a901f1 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 {
@@ -89,7 +89,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
}
public boolean catRidable = false;
@@ -873,6 +875,7 @@ public class PurpurWorldConfig {
@@ -879,6 +881,7 @@ public class PurpurWorldConfig {
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
public boolean endermanBypassMobGriefing = false;
@@ -97,7 +97,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -885,6 +888,7 @@ public class PurpurWorldConfig {
@@ -891,6 +894,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 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
}
public boolean endermiteRidable = false;
@@ -1570,6 +1574,7 @@ public class PurpurWorldConfig {
@@ -1576,6 +1580,7 @@ public class PurpurWorldConfig {
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
@@ -113,7 +113,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1587,6 +1592,7 @@ public class PurpurWorldConfig {
@@ -1593,6 +1598,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 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
}
public boolean squidRidable = false;
@@ -1640,6 +1646,7 @@ public class PurpurWorldConfig {
@@ -1646,6 +1652,7 @@ public class PurpurWorldConfig {
public double striderMaxHealth = 20.0D;
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
@@ -129,7 +129,7 @@ index 60ff59cfbd5e748a6899fdbee4e06d7a01eff115..fade989848435cc96baed2400ebbb192
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1651,6 +1658,7 @@ public class PurpurWorldConfig {
@@ -1657,6 +1664,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);