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

Turtle eggs random tick crack chance

Browse Source
This commit is contained in:
BillyGalbreath
2021-12-31 06:28:36 -06:00
parent 996ea58dbe
commit 1597c773e3
164 changed files with 861 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,10 +393,23 @@ index b942e7c85e6c8f9a7664d9e5bf93bcd79e0651f1..5b29f3fced5435e172dd69f6f4eb265e
return true;
// Purpur end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9369f3d3b 100644
index ab2a909c34c9074916cdc1a5e0eabe920078180f..cb3c57b1e257c8f5c196de6f09c6cff9846e06c9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -381,8 +381,11 @@ public class PurpurWorldConfig {
@@ -103,10 +103,12 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
+ public boolean turtleEggsBypassMobGriefing = false;
private void turtleEggSettings() {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
+ turtleEggsBypassMobGriefing = getBoolean("blocks.turtle_egg.bypass-mob-griefing", turtleEggsBypassMobGriefing);
}
public float armorstandStepHeight = 0.0F;
@@ -390,8 +392,11 @@ public class PurpurWorldConfig {
public boolean boatsDoFallDamage = true;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesCanUsePortals = true;
@@ -408,7 +421,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public double voidDamageDealt = 4.0D;
@@ -394,8 +397,11 @@ public class PurpurWorldConfig {
@@ -403,8 +408,11 @@ public class PurpurWorldConfig {
boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -420,7 +433,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);
@@ -436,9 +442,11 @@ public class PurpurWorldConfig {
@@ -445,9 +453,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -432,7 +445,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -472,6 +480,11 @@ public class PurpurWorldConfig {
@@ -481,6 +491,11 @@ public class PurpurWorldConfig {
waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources);
}
@@ -444,7 +457,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -673,6 +686,7 @@ public class PurpurWorldConfig {
@@ -682,6 +697,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -452,7 +465,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -684,6 +698,7 @@ public class PurpurWorldConfig {
@@ -693,6 +709,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -460,7 +473,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean dolphinRidable = false;
@@ -771,6 +786,7 @@ public class PurpurWorldConfig {
@@ -780,6 +797,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -468,7 +481,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -786,6 +802,7 @@ public class PurpurWorldConfig {
@@ -795,6 +813,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -476,7 +489,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean endermanRidable = false;
@@ -793,6 +810,7 @@ public class PurpurWorldConfig {
@@ -802,6 +821,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -484,7 +497,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -804,6 +822,7 @@ public class PurpurWorldConfig {
@@ -813,6 +833,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -492,7 +505,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean endermiteRidable = false;
@@ -823,6 +842,7 @@ public class PurpurWorldConfig {
@@ -832,6 +853,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -500,7 +513,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -832,6 +852,7 @@ public class PurpurWorldConfig {
@@ -841,6 +863,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -508,7 +521,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean foxRidable = false;
@@ -839,6 +860,7 @@ public class PurpurWorldConfig {
@@ -848,6 +871,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -516,7 +529,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -850,6 +872,7 @@ public class PurpurWorldConfig {
@@ -859,6 +883,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -524,7 +537,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean ghastRidable = false;
@@ -1245,6 +1268,7 @@ public class PurpurWorldConfig {
@@ -1254,6 +1279,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -532,7 +545,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1254,6 +1278,7 @@ public class PurpurWorldConfig {
@@ -1263,6 +1289,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -540,7 +553,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean piglinBruteRidable = false;
@@ -1273,6 +1298,7 @@ public class PurpurWorldConfig {
@@ -1282,6 +1309,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -548,7 +561,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1282,6 +1308,7 @@ public class PurpurWorldConfig {
@@ -1291,6 +1319,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -556,7 +569,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean polarBearRidable = false;
@@ -1323,6 +1350,7 @@ public class PurpurWorldConfig {
@@ -1332,6 +1361,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -564,7 +577,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1335,11 +1363,13 @@ public class PurpurWorldConfig {
@@ -1344,11 +1374,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);
@@ -578,7 +591,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1349,6 +1379,7 @@ public class PurpurWorldConfig {
@@ -1358,6 +1390,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -586,7 +599,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean salmonRidable = false;
@@ -1367,6 +1398,7 @@ public class PurpurWorldConfig {
@@ -1376,6 +1409,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -594,7 +607,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1377,6 +1409,7 @@ public class PurpurWorldConfig {
@@ -1386,6 +1420,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -602,7 +615,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean shulkerRidable = false;
@@ -1396,6 +1429,7 @@ public class PurpurWorldConfig {
@@ -1405,6 +1440,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -610,7 +623,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1405,6 +1439,7 @@ public class PurpurWorldConfig {
@@ -1414,6 +1450,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -618,7 +631,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean skeletonRidable = false;
@@ -1472,6 +1507,7 @@ public class PurpurWorldConfig {
@@ -1481,6 +1518,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -626,7 +639,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1488,6 +1524,7 @@ public class PurpurWorldConfig {
@@ -1497,6 +1535,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);
@@ -634,19 +647,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean squidRidable = false;
@@ -1594,6 +1631,11 @@ public class PurpurWorldConfig {
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
}
+ public boolean turtleEggsBypassMobGriefing = false;
+ private void turtleSettings() {
+ turtleEggsBypassMobGriefing = getBoolean("blocks.turtle_egg.bypass-mob-griefing", turtleEggsBypassMobGriefing);
+ }
+
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
public double turtleMaxHealth = 30.0D;
@@ -1645,6 +1687,7 @@ public class PurpurWorldConfig {
@@ -1648,6 +1687,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -654,7 +655,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1664,6 +1707,7 @@ public class PurpurWorldConfig {
@@ -1667,6 +1707,7 @@ public class PurpurWorldConfig {
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -662,7 +663,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean vindicatorRidable = false;
@@ -1720,6 +1764,7 @@ public class PurpurWorldConfig {
@@ -1723,6 +1764,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -670,7 +671,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1736,6 +1781,7 @@ public class PurpurWorldConfig {
@@ -1739,6 +1781,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);
@@ -678,7 +679,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
}
public boolean witherSkeletonRidable = false;
@@ -1800,6 +1846,7 @@ public class PurpurWorldConfig {
@@ -1803,6 +1846,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -686,7 +687,7 @@ index 7b6ada310586de6313c426d88c28cba4fe6535ac..7891f3bf4424071d4a0a01d35c484af9
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1814,6 +1861,7 @@ public class PurpurWorldConfig {
@@ -1817,6 +1861,7 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);