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

Rebase on latest Purpur (#230)

Browse Source
This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -338,7 +338,7 @@ index 04504901b1933ed760b34b8abb994de8ec340a4e..e18be05c9a9230105ec54395d4391c86
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 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa55617797970 100644
index ea9b5be83f65eee0651c0ca5afd514b41944bb85..7c9c425b6917f3fbcdecdff718421ec77acdd23e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -252,6 +252,7 @@ public class PurpurWorldConfig {
@@ -357,7 +357,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
@@ -406,9 +408,11 @@ public class PurpurWorldConfig {
@@ -418,9 +420,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -369,7 +369,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -467,10 +471,12 @@ public class PurpurWorldConfig {
@@ -479,10 +483,12 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -382,7 +382,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
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);
@@ -742,12 +748,14 @@ public class PurpurWorldConfig {
@@ -754,12 +760,14 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -397,7 +397,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth);
set("mobs.ender_dragon.max-health", null);
@@ -763,12 +771,14 @@ public class PurpurWorldConfig {
@@ -775,12 +783,14 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public boolean endermanAllowGriefing = true;
@@ -412,7 +412,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.enderman.attributes.max-health", endermanMaxHealth);
@@ -794,10 +804,12 @@ public class PurpurWorldConfig {
@@ -806,10 +816,12 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
@@ -425,7 +425,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.evoker.attributes.max-health", evokerMaxHealth);
set("mobs.evoker.attributes.max-health", null);
@@ -808,12 +820,14 @@ public class PurpurWorldConfig {
@@ -820,12 +832,14 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
@@ -440,7 +440,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
if (PurpurConfig.version < 10) {
@@ -1250,10 +1264,12 @@ public class PurpurWorldConfig {
@@ -1262,10 +1276,12 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
@@ -453,7 +453,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.pillager.attributes.max-health", pillagerMaxHealth);
set("mobs.pillager.attributes.max-health", null);
@@ -1297,6 +1313,7 @@ public class PurpurWorldConfig {
@@ -1309,6 +1325,7 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
@@ -461,7 +461,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -1304,6 +1321,7 @@ public class PurpurWorldConfig {
@@ -1316,6 +1333,7 @@ public class PurpurWorldConfig {
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -469,7 +469,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
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);
@@ -1317,10 +1335,12 @@ public class PurpurWorldConfig {
@@ -1329,10 +1347,12 @@ public class PurpurWorldConfig {
public boolean ravagerRidable = false;
public boolean ravagerRidableInWater = false;
@@ -482,7 +482,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.ravager.attributes.max-health", ravagerMaxHealth);
set("mobs.ravager.attributes.max-health", null);
@@ -1344,11 +1364,13 @@ public class PurpurWorldConfig {
@@ -1356,11 +1376,13 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public int sheepBreedingTicks = 6000;
@@ -496,7 +496,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.sheep.attributes.max-health", sheepMaxHealth);
set("mobs.sheep.attributes.max-health", null);
@@ -1373,10 +1395,12 @@ public class PurpurWorldConfig {
@@ -1385,10 +1407,12 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
@@ -509,7 +509,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.silverfish.attributes.max-health", silverfishMaxHealth);
set("mobs.silverfish.attributes.max-health", null);
@@ -1441,6 +1465,7 @@ public class PurpurWorldConfig {
@@ -1453,6 +1477,7 @@ public class PurpurWorldConfig {
public boolean snowGolemRidable = false;
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
@@ -517,7 +517,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
public boolean snowGolemDropsPumpkin = true;
public boolean snowGolemPutPumpkinBack = false;
public int snowGolemSnowBallMin = 20;
@@ -1452,6 +1477,7 @@ public class PurpurWorldConfig {
@@ -1464,6 +1489,7 @@ public class PurpurWorldConfig {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
snowGolemLeaveTrailWhenRidden = getBoolean("mobs.snow_golem.leave-trail-when-ridden", snowGolemLeaveTrailWhenRidden);
@@ -525,7 +525,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
snowGolemSnowBallMin = getInt("mobs.snow_golem.min-shoot-interval-ticks", snowGolemSnowBallMin);
@@ -1670,6 +1696,7 @@ public class PurpurWorldConfig {
@@ -1682,6 +1708,7 @@ public class PurpurWorldConfig {
public boolean witherRidable = false;
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
@@ -533,7 +533,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public double witherMaxHealth = 300.0D;
@@ -1677,6 +1704,7 @@ public class PurpurWorldConfig {
@@ -1689,6 +1716,7 @@ public class PurpurWorldConfig {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
witherMaxY = getDouble("mobs.wither.ridable-max-y", witherMaxY);
@@ -541,7 +541,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
@@ -1749,6 +1777,7 @@ public class PurpurWorldConfig {
@@ -1761,6 +1789,7 @@ public class PurpurWorldConfig {
public boolean zombieRidable = false;
public boolean zombieRidableInWater = false;
@@ -549,7 +549,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -1759,6 +1788,7 @@ public class PurpurWorldConfig {
@@ -1771,6 +1800,7 @@ public class PurpurWorldConfig {
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);