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

Flying glow squids

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 22:55:45 -05:00
parent 9e531fe333
commit afabb3c5b6
21 changed files with 157 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583f8a73032 100644
index 2889fefb433b7a7611eb8a168ad5de671cc342b4..fa8bc169febef0f0513c584d558238cc28decfac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -351,9 +351,12 @@ public class PurpurWorldConfig {
@@ -538,7 +538,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean ghastRidable = false;
@@ -1246,6 +1274,7 @@ public class PurpurWorldConfig {
@@ -1248,6 +1276,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1255,6 +1284,7 @@ public class PurpurWorldConfig {
@@ -1257,6 +1286,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean piglinBruteRidable = false;
@@ -1274,6 +1304,7 @@ public class PurpurWorldConfig {
@@ -1276,6 +1306,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1283,6 +1314,7 @@ public class PurpurWorldConfig {
@@ -1285,6 +1316,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean polarBearRidable = false;
@@ -1324,6 +1356,7 @@ public class PurpurWorldConfig {
@@ -1326,6 +1358,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1336,11 +1369,13 @@ public class PurpurWorldConfig {
@@ -1338,11 +1371,13 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -592,7 +592,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1350,6 +1385,7 @@ public class PurpurWorldConfig {
@@ -1352,6 +1387,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean salmonRidable = false;
@@ -1368,6 +1404,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1406,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1378,6 +1415,7 @@ public class PurpurWorldConfig {
@@ -1380,6 +1417,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean shulkerRidable = false;
@@ -1397,6 +1435,7 @@ public class PurpurWorldConfig {
@@ -1399,6 +1437,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1406,6 +1445,7 @@ public class PurpurWorldConfig {
@@ -1408,6 +1447,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean skeletonRidable = false;
@@ -1473,6 +1513,7 @@ public class PurpurWorldConfig {
@@ -1475,6 +1515,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1489,6 +1530,7 @@ public class PurpurWorldConfig {
@@ -1491,6 +1532,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -648,7 +648,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean squidRidable = false;
@@ -1648,6 +1690,7 @@ public class PurpurWorldConfig {
@@ -1650,6 +1692,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1674,6 +1717,7 @@ public class PurpurWorldConfig {
@@ -1676,6 +1719,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean vindicatorRidable = false;
@@ -1730,6 +1774,7 @@ public class PurpurWorldConfig {
@@ -1732,6 +1776,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1746,6 +1791,7 @@ public class PurpurWorldConfig {
@@ -1748,6 +1793,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -680,7 +680,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
}
public boolean witherSkeletonRidable = false;
@@ -1813,6 +1859,7 @@ public class PurpurWorldConfig {
@@ -1815,6 +1861,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 9cfc57521884cf34b581d246b8754fff5b326bdc..e990159137c9ea635ae69434f0a12583
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1832,6 +1879,7 @@ public class PurpurWorldConfig {
@@ -1834,6 +1881,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}