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

fix compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-05 18:18:14 -05:00
parent 7fe89b5a84
commit 0ae1daa043
12 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,7 +393,7 @@ 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 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf35264168 100644
index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..b3631cb89f1ac4486596d438215724a29ca883e4 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 {
@@ -634,7 +634,19 @@ index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf
}
public boolean squidRidable = false;
@@ -1645,6 +1682,7 @@ public class PurpurWorldConfig {
@@ -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 {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -642,7 +654,7 @@ index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1664,6 +1702,7 @@ public class PurpurWorldConfig {
@@ -1664,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);
@@ -650,7 +662,7 @@ index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf
}
public boolean vindicatorRidable = false;
@@ -1720,6 +1759,7 @@ public class PurpurWorldConfig {
@@ -1720,6 +1764,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -658,7 +670,7 @@ index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1736,6 +1776,7 @@ public class PurpurWorldConfig {
@@ -1736,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);
@@ -666,7 +678,7 @@ index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf
}
public boolean witherSkeletonRidable = false;
@@ -1800,6 +1841,7 @@ public class PurpurWorldConfig {
@@ -1800,6 +1846,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -674,7 +686,7 @@ index 45b4ac35cb0b596c5ad6c9ab03739e337425becc..eb41a866b47b0051a6a7e4268bc946bf
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1814,6 +1856,7 @@ public class PurpurWorldConfig {
@@ -1814,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);