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

Add '*' as an option to item immunities

Browse Source
This commit is contained in:
BillyGalbreath
2021-01-25 12:39:40 -06:00
parent df9bd08c65
commit 7b0b3f74e1
64 changed files with 213 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0077-Item-entity-immunities.patch
View File

@@ -94,10 +94,10 @@ index 228236bce14bfdf930570b453862dcfaae9e4823..ad06bd81eded5d60f16c2d0ad1a4390f
int i;
int j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c5193b394319fa68bedc6aa07b57fea24ac49d80..399e9b3e6289efe0fc5db274c10a5cad41d68909 100644
index c5193b394319fa68bedc6aa07b57fea24ac49d80..9940bf351c05606137837ab2400ffe1a02b9bec2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,27 @@ public class PurpurWorldConfig {
@@ -101,6 +101,39 @@ public class PurpurWorldConfig {
}
}
@@ -107,16 +107,28 @@ index c5193b394319fa68bedc6aa07b57fea24ac49d80..399e9b3e6289efe0fc5db274c10a5cad
+ private void itemSettings() {
+ itemImmuneToCactus.clear();
+ getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
+ if (key.toString().equals("*")) {
+ IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToCactus.add(item));
+ return;
+ }
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToCactus.add(item);
+ });
+ itemImmuneToExplosion.clear();
+ getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> {
+ if (key.toString().equals("*")) {
+ IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToExplosion.add(item));
+ return;
+ }
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToExplosion.add(item);
+ });
+ itemImmuneToFire.clear();
+ getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> {
+ if (key.toString().equals("*")) {
+ IRegistry.ITEM.g().filter(item -> item != Items.AIR).forEach((item) -> itemImmuneToFire.add(item));
+ return;
+ }
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToFire.add(item);
+ });

8
patches/server/0079-Configurable-jockey-options.patch
View File

@@ -193,10 +193,10 @@ index e021c43b43839c00f81a01bfbec59c546d61ba50..505c83f3e3ad61c2d4d40c4df017e1f7
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 399e9b3e6289efe0fc5db274c10a5cad41d68909..a2b2318332399def197a5f7ac22d7cd0430ccde7 100644
index 9940bf351c05606137837ab2400ffe1a02b9bec2..81a96503a6243800f4c37dc32f9550e3ee817fbb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -263,6 +263,15 @@ public class PurpurWorldConfig {
@@ -275,6 +275,15 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -212,7 +212,7 @@ index 399e9b3e6289efe0fc5db274c10a5cad41d68909..a2b2318332399def197a5f7ac22d7cd0
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -300,6 +309,15 @@ public class PurpurWorldConfig {
@@ -312,6 +321,15 @@ public class PurpurWorldConfig {
giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
}
@@ -228,7 +228,7 @@ index 399e9b3e6289efe0fc5db274c10a5cad41d68909..a2b2318332399def197a5f7ac22d7cd0
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
public double illusionerMaxHealth = 32.0D;
@@ -375,8 +393,35 @@ public class PurpurWorldConfig {
@@ -387,8 +405,35 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
}

4
patches/server/0080-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -321,10 +321,10 @@ index 3a70900c73e3a6c4f40cf74406534f4bfd3eb67b..dfce36368da9bdd9285c490a802f7a0c
return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a2b2318332399def197a5f7ac22d7cd0430ccde7..7eecd48d572635f1082ca1629471341eac82b6e1 100644
index 81a96503a6243800f4c37dc32f9550e3ee817fbb..39f6b309342b91ab3bd4eed4afbeb8ccb1387e64 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -337,6 +337,15 @@ public class PurpurWorldConfig {
@@ -349,6 +349,15 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

4
patches/server/0081-Add-phantom-spawning-options.patch
View File

@@ -245,10 +245,10 @@ index fb650c09dbcefa0ff021f7c508ff6811a48bee7a..68cce071c740c90149225b4a28af8492
public int c() {
return this.d;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7eecd48d572635f1082ca1629471341eac82b6e1..feb8434f0c62f1de177326d28e52beb487487e76 100644
index 39f6b309342b91ab3bd4eed4afbeb8ccb1387e64..966784d5398929497f4a426280bba47bb7caf9a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -340,10 +340,34 @@ public class PurpurWorldConfig {
@@ -352,10 +352,34 @@ public class PurpurWorldConfig {
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;

4
patches/server/0082-Implement-bed-explosion-options.patch
View File

@@ -18,7 +18,7 @@ index 24a5c64b65f0098b1395d352cc2f99bbbbaf9c94..738535d01adf8bfd895b5057e5950422
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index feb8434f0c62f1de177326d28e52beb487487e76..e86e11f5d0d48871b47aa4038370cc3ca0859f8c 100644
index 966784d5398929497f4a426280bba47bb7caf9a7..ea20ca8dc50ff1216ce8ca351ef991d5808bd88c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -37,7 +37,7 @@ index feb8434f0c62f1de177326d28e52beb487487e76..e86e11f5d0d48871b47aa4038370cc3c
import static net.pl3x.purpur.PurpurConfig.log;
@@ -200,6 +202,22 @@ public class PurpurWorldConfig {
@@ -212,6 +214,22 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0083-Implement-respawn-anchor-explosion-options.patch
View File

@@ -30,10 +30,10 @@ index 21c5ad83a95bcd23071423c0e8336656b760fcde..521d161a3d015b641b61de21401c79ac
public static boolean a(World world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e86e11f5d0d48871b47aa4038370cc3ca0859f8c..8564c502e5de5f89a2aa05a3173bd96ca8952eec 100644
index ea20ca8dc50ff1216ce8ca351ef991d5808bd88c..8aaa718a0df3f71f9a06bf8eb3547453b26551da 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -239,6 +239,22 @@ public class PurpurWorldConfig {
@@ -251,6 +251,22 @@ public class PurpurWorldConfig {
lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether);
}

2
patches/server/0086-Entity-lifespan.patch
View File

@@ -104,7 +104,7 @@ index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640df
event = new PlayerInteractEntityEvent((Player) this.getPlayer(), entity.getBukkitEntity(), (packetplayinuseentity.c() == EnumHand.OFF_HAND) ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8564c502e5de5f89a2aa05a3173bd96ca8952eec..e6a7594bec24dad1bb8b1bfd23a724121909bf9a 100644
index 8aaa718a0df3f71f9a06bf8eb3547453b26551da..5a04f0e506293f76bc43540142ca3b26cf97c760 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,6 +103,11 @@ public class PurpurWorldConfig {

4
patches/server/0087-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -48,10 +48,10 @@ index ff4e60e321e0df7d43078ae0899b9e08717ad9b3..994e17f874696d7a410d2c308efe060d
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e6a7594bec24dad1bb8b1bfd23a724121909bf9a..90963c50431bafd52bab4b88f382a7c2e9bdc9fa 100644
index 5a04f0e506293f76bc43540142ca3b26cf97c760..0b2a9a2d9f157dd9879c4429be6745859b4f28bf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,6 +184,11 @@ public class PurpurWorldConfig {
@@ -196,6 +196,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

4
patches/server/0088-Squid-EAR-immunity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 90963c50431bafd52bab4b88f382a7c2e9bdc9fa..8513586bb49db65de779925082aa30abc4c96ad8 100644
index 0b2a9a2d9f157dd9879c4429be6745859b4f28bf..01576ac82836733f42168c6a0779b45ae63aeebb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -441,6 +441,11 @@ public class PurpurWorldConfig {
@@ -453,6 +453,11 @@ public class PurpurWorldConfig {
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
}

6
patches/server/0091-Phantoms-burn-in-light.patch
View File

@@ -70,10 +70,10 @@ index 4c379916d8d7797038d2980761c49f44c010dea8..ea6b61c9b88f33d29f7266d7614c8037
public static final Item dr = a(Blocks.JACK_O_LANTERN, CreativeModeTab.b);
public static final Item ds = a(Blocks.OAK_TRAPDOOR, CreativeModeTab.d);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8513586bb49db65de779925082aa30abc4c96ad8..d99edfca69b981f9a9187c3187a7245e697a142f 100644
index 01576ac82836733f42168c6a0779b45ae63aeebb..a4e5462d4731aaa4b0c436cf001d9c2be1cc961c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -396,6 +396,9 @@ public class PurpurWorldConfig {
@@ -408,6 +408,9 @@ public class PurpurWorldConfig {
public int phantomSpawnOverheadRadius = 10;
public int phantomSpawnMinPerAttempt = 1;
public int phantomSpawnMaxPerAttempt = -1;
@@ -83,7 +83,7 @@ index 8513586bb49db65de779925082aa30abc4c96ad8..d99edfca69b981f9a9187c3187a7245e
private void phantomSettings() {
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
@@ -412,6 +415,9 @@ public class PurpurWorldConfig {
@@ -424,6 +427,9 @@ public class PurpurWorldConfig {
phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius);
phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt);
phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt);

6
patches/server/0092-Configurable-villager-breeding.patch
View File

@@ -18,10 +18,10 @@ index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f195916
private boolean fr() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d99edfca69b981f9a9187c3187a7245e697a142f..9cbdf0f7553f9be72a1039b56dc9092fd3a3043f 100644
index a4e5462d4731aaa4b0c436cf001d9c2be1cc961c..76ed53f930f6d2e01a854d0e28db4bcf11a06627 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -459,6 +459,7 @@ public class PurpurWorldConfig {
@@ -471,6 +471,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
@@ -29,7 +29,7 @@ index d99edfca69b981f9a9187c3187a7245e697a142f..9cbdf0f7553f9be72a1039b56dc9092f
private void villagerSettings() {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
@@ -467,6 +468,7 @@ public class PurpurWorldConfig {
@@ -479,6 +480,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);

4
patches/server/0093-Redstone-deactivates-spawners.patch
View File

@@ -26,10 +26,10 @@ index c2e830db7aa2944a477624e149a3ba66d112b68a..3b4cc9871c123cfd134783745145c407
public abstract BlockPosition b();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9cbdf0f7553f9be72a1039b56dc9092fd3a3043f..6b8eeb4a11ed24ac0f855919c2862b0bb5c55d76 100644
index 76ed53f930f6d2e01a854d0e28db4bcf11a06627..1f83fae3935d8bdacd396697e36d3c80d4d93b42 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -272,6 +272,11 @@ public class PurpurWorldConfig {
@@ -284,6 +284,11 @@ public class PurpurWorldConfig {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
}

4
patches/server/0094-Totems-work-in-inventory.patch
View File

@@ -29,10 +29,10 @@ index bfbe9b82c14a525bffa96a8dfa071e8805ce6006..c22fa35197ae23526a29bcbf69f3022f
event.setCancelled(itemstack == null);
this.world.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6b8eeb4a11ed24ac0f855919c2862b0bb5c55d76..9d0c38d583cd03100df53eba7db090f62ee8b59a 100644
index 1f83fae3935d8bdacd396697e36d3c80d4d93b42..9c32d1d0d283ce8fb290623c8e40c2606d2fdd82 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -189,6 +189,11 @@ public class PurpurWorldConfig {
@@ -201,6 +201,11 @@ public class PurpurWorldConfig {
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
}

2
patches/server/0098-Add-vindicator-johnny-spawn-chance.patch
View File

@@ -22,7 +22,7 @@ index 4761ddfedeed54e79788a6f60f06a805efd60ab1..23b350f793539672b6990327ed52e9bb
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9d0c38d583cd03100df53eba7db090f62ee8b59a..4d8fa3a6e9729b3172685a9f3d27af06792ac8ca 100644
index 9c32d1d0d283ce8fb290623c8e40c2606d2fdd82..a38cea444879becaa043f131b754f7d812375e6c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -40,6 +40,11 @@ public class PurpurWorldConfig {

4
patches/server/0101-Dispensers-place-anvils-option.patch
View File

@@ -61,10 +61,10 @@ index 7b8a470d97ccf0fdcdb8eef9368195486e09913b..d1f9d2884d055efbe72b01f86b0bdaf1
static void a(ISourceBlock isourceblock, Entity entity, EnumDirection enumdirection) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4d8fa3a6e9729b3172685a9f3d27af06792ac8ca..be101114003d06b445040b98b8b80e78a0b44bed 100644
index a38cea444879becaa043f131b754f7d812375e6c..059c66a2d3f878cde8896c8f10f71bfecaea4685 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -239,8 +239,10 @@ public class PurpurWorldConfig {
@@ -251,8 +251,10 @@ public class PurpurWorldConfig {
}
public boolean dispenserApplyCursedArmor = true;

4
patches/server/0102-Allow-anvil-colors.patch
View File

@@ -35,10 +35,10 @@ index 4aa6b035a6a8ea39401c6566cd286de39f60e942..5e4e59e5c8478b76078fdda14e5ced76
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index be101114003d06b445040b98b8b80e78a0b44bed..02fdf6d801f6583ac9991fc08d9811432fb9602b 100644
index 059c66a2d3f878cde8896c8f10f71bfecaea4685..95d13aafc468532f66abd265657f463e361f2297 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -222,6 +222,11 @@ public class PurpurWorldConfig {
@@ -234,6 +234,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0103-Add-no-tick-block-list.patch
View File

@@ -43,7 +43,7 @@ index 2f41a537fb1d8348b5f65a3e85da841761311744..d5007d00da9a10e99d7fa46a4368d41f
this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
return fluidtype == null || fluidtype == FluidTypes.EMPTY;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 02fdf6d801f6583ac9991fc08d9811432fb9602b..20643bb4e8f0696729f68b430588f71ad090d963 100644
index 95d13aafc468532f66abd265657f463e361f2297..84db039126ab866aa2be4b7b1c0efa7e17573a54 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection;
@@ -57,7 +57,7 @@ index 02fdf6d801f6583ac9991fc08d9811432fb9602b..20643bb4e8f0696729f68b430588f71a
import java.util.logging.Level;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -189,6 +191,16 @@ public class PurpurWorldConfig {
@@ -201,6 +203,16 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

4
patches/server/0104-Add-option-to-disable-dolphin-treasure-searching.patch
View File

@@ -17,10 +17,10 @@ index 2916ee89ef7a14619703dfbe7efd5c78a2f34337..664f9693368852bfb06a7a3bd0862a10
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 20643bb4e8f0696729f68b430588f71ad090d963..81b5ffd65bde9f73d7c920bec3466222e03ffe83 100644
index 84db039126ab866aa2be4b7b1c0efa7e17573a54..33aae151c8d79bac8fb52f2c3f526d0017306098 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -341,6 +341,11 @@ public class PurpurWorldConfig {
@@ -353,6 +353,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

4
patches/server/0106-Stop-squids-floating-on-top-of-water.patch
View File

@@ -43,10 +43,10 @@ index b21605a62365fe24f315f35bd840b4740fc80f0e..148e4b158734f136832e5c17bdc69634
protected void initPathfinder() {
this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 81b5ffd65bde9f73d7c920bec3466222e03ffe83..19aded59462bd6851924362da124dee86e5104ae 100644
index 33aae151c8d79bac8fb52f2c3f526d0017306098..94f11a3dc2a4e595e3fe9dffee3d31de0040292f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -487,8 +487,10 @@ public class PurpurWorldConfig {
@@ -499,8 +499,10 @@ public class PurpurWorldConfig {
}
public boolean squidImmuneToEAR = true;

18
patches/server/0107-Ridables.patch
View File

@@ -5071,7 +5071,7 @@ index c314a8c9a921a95cea43b748e2037521d948e1e7..59f3122aab9940cb3c3c1efb2664ab08
public static int dungeonSeed = -1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b7318b183 100644
index 94f11a3dc2a4e595e3fe9dffee3d31de0040292f..a70f8d6bd20bebb128ef0c232384f7d43e9b6e80 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@@ -5086,7 +5086,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
private ConfigurationSection getConfigurationSection(String path) {
ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path);
return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path);
@@ -315,61 +310,186 @@ public class PurpurWorldConfig {
@@ -327,61 +322,186 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}
@@ -5273,7 +5273,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
public float giantStepHeight = 2.0F;
public float giantJumpHeight = 1.0F;
public double giantMovementSpeed = 0.5D;
@@ -378,6 +498,8 @@ public class PurpurWorldConfig {
@@ -390,6 +510,8 @@ public class PurpurWorldConfig {
public boolean giantHaveHostileAI = false;
public double giantMaxHealth = 100.0D;
private void giantSettings() {
@@ -5282,7 +5282,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight);
giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight);
giantMovementSpeed = getDouble("mobs.giant.movement-speed", giantMovementSpeed);
@@ -392,19 +514,44 @@ public class PurpurWorldConfig {
@@ -404,19 +526,44 @@ public class PurpurWorldConfig {
giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth);
}
@@ -5327,7 +5327,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
illusionerMovementSpeed = getDouble("mobs.illusioner.movement-speed", illusionerMovementSpeed);
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
if (PurpurConfig.version < 8) {
@@ -415,11 +562,76 @@ public class PurpurWorldConfig {
@@ -427,11 +574,76 @@ public class PurpurWorldConfig {
illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth);
}
@@ -5404,7 +5404,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
public double phantomAttackedByCrystalRadius = 0.0D;
public float phantomAttackedByCrystalDamage = 1.0F;
public double phantomOrbitCrystalRadius = 0.0D;
@@ -439,6 +651,11 @@ public class PurpurWorldConfig {
@@ -451,6 +663,11 @@ public class PurpurWorldConfig {
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
private void phantomSettings() {
@@ -5416,7 +5416,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius);
phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage);
phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius);
@@ -459,40 +676,184 @@ public class PurpurWorldConfig {
@@ -471,40 +688,184 @@ public class PurpurWorldConfig {
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
}
@@ -5601,7 +5601,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerCanBeLeashed = false;
@@ -502,6 +863,8 @@ public class PurpurWorldConfig {
@@ -514,6 +875,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
private void villagerSettings() {
@@ -5610,7 +5610,7 @@ index 19aded59462bd6851924362da124dee86e5104ae..b695a156ce4140e606e09360f0846a0b
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
@@ -512,45 +875,108 @@ public class PurpurWorldConfig {
@@ -524,45 +887,108 @@ public class PurpurWorldConfig {
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
}

6
patches/server/0110-Entities-can-use-portals-configuration.patch
View File

@@ -27,10 +27,10 @@ index 0115e2c73eff9d5e4c6778e32fc54b9c116b6b22..e4f2e51b6306fcaf161b7dfb734d9d28
public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b695a156ce4140e606e09360f0846a0b7318b183..50aa19fc54dab84e587bae45dee00ec984853666 100644
index a70f8d6bd20bebb128ef0c232384f7d43e9b6e80..3ce06799d0c5798f094171b3c559b7eec65b66a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -146,6 +146,7 @@ public class PurpurWorldConfig {
@@ -158,6 +158,7 @@ public class PurpurWorldConfig {
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
@@ -38,7 +38,7 @@ index b695a156ce4140e606e09360f0846a0b7318b183..50aa19fc54dab84e587bae45dee00ec9
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -154,6 +155,7 @@ public class PurpurWorldConfig {
@@ -166,6 +167,7 @@ public class PurpurWorldConfig {
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);

4
patches/server/0112-Customizable-wither-health-and-healing.patch
View File

@@ -44,10 +44,10 @@ index 0442b722e5dc7ccc6e607fb3fa7766496b3398d5..9d67ce93573f85d64e8f0a8bd9434c13
//this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 50aa19fc54dab84e587bae45dee00ec984853666..7e237f24f8e5b8777ea035c57f91ff80c688a974 100644
index 3ce06799d0c5798f094171b3c559b7eec65b66a3..789d471ae244f635fc393d0bf581189587a7ee57 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -907,10 +907,21 @@ public class PurpurWorldConfig {
@@ -919,10 +919,21 @@ public class PurpurWorldConfig {
public boolean witherRidable = false;
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;

4
patches/server/0113-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -72,7 +72,7 @@ index 79ae47ffafae09059774e45b48a36818e104b036..7ee7975d5569d24c836018e240ebd785
this.worldDataServer = (WorldDataServer) iworlddataserver;
worldDataServer.world = this;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7e237f24f8e5b8777ea035c57f91ff80c688a974..953bfd9bc7a9cf9abb2b7907af507d12b5e22be0 100644
index 789d471ae244f635fc393d0bf581189587a7ee57..c38f262a8151397be319f083ee6c201ccaf1a9ec 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;
@@ -118,7 +118,7 @@ index 7e237f24f8e5b8777ea035c57f91ff80c688a974..953bfd9bc7a9cf9abb2b7907af507d12
private double getDouble(String path, double def) {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
@@ -161,6 +172,21 @@ public class PurpurWorldConfig {
@@ -173,6 +184,21 @@ public class PurpurWorldConfig {
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
}

6
patches/server/0114-Raid-cooldown-setting.patch
View File

@@ -52,10 +52,10 @@ index 826dcf9f7eedc3664d66170b97b2a19552a0dc60..807910c60e6cad58b91474b0477e6fc1
if (!this.raids.containsKey(raid.getId())) {
this.raids.put(raid.getId(), raid);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 953bfd9bc7a9cf9abb2b7907af507d12b5e22be0..bdf0c0d501913646b0e606c0cfddf6862f10c203 100644
index c38f262a8151397be319f083ee6c201ccaf1a9ec..d7a4bf3ecb012adddbb9be2b42e9815c739659c7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -161,6 +161,7 @@ public class PurpurWorldConfig {
@@ -173,6 +173,7 @@ public class PurpurWorldConfig {
public boolean milkCuresBadOmen = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
@@ -63,7 +63,7 @@ index 953bfd9bc7a9cf9abb2b7907af507d12b5e22be0..bdf0c0d501913646b0e606c0cfddf686
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -170,6 +171,7 @@ public class PurpurWorldConfig {
@@ -182,6 +183,7 @@ public class PurpurWorldConfig {
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);

4
patches/server/0115-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -300,10 +300,10 @@ index b7e540dfeeabb13227596ecfc6eddabf3cfde537..56adefabdfbf444e87129715f107c6d3
public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bdf0c0d501913646b0e606c0cfddf6862f10c203..865d16dd780ff7091f2ba456728c084ddd760bb3 100644
index d7a4bf3ecb012adddbb9be2b42e9815c739659c7..fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -153,6 +153,35 @@ public class PurpurWorldConfig {
@@ -165,6 +165,35 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}

4
patches/server/0117-Add-option-to-disable-zombie-aggressiveness-towards-.patch
View File

@@ -69,10 +69,10 @@ index d835ce3fe7c71333efeed5b9cf2a827bebae97f2..556f7a3ebb5c58a87471b2d098f29ffb
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 865d16dd780ff7091f2ba456728c084ddd760bb3..8903d4dbcfa72c6739d5170ff826a35fb5c5af7e 100644
index fe0e89ec0daf03805a2d4c6a6a8096ce39556dd0..3d4e99bdab36ae51eb001ba40c30e56478b9eefd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1009,12 +1009,14 @@ public class PurpurWorldConfig {
@@ -1021,12 +1021,14 @@ public class PurpurWorldConfig {
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;

6
patches/server/0118-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -165,10 +165,10 @@ index 58d958a88ac5af5b889d719d9f1ea90ce45cf184..8e8749095427b44e04582593114cae8c
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8903d4dbcfa72c6739d5170ff826a35fb5c5af7e..c6347cd51659c1cde6d190ad189bf286843f86d7 100644
index 3d4e99bdab36ae51eb001ba40c30e56478b9eefd..643dfd2f50939708fa6f3127ca371674f69f6527 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -188,6 +188,7 @@ public class PurpurWorldConfig {
@@ -200,6 +200,7 @@ public class PurpurWorldConfig {
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
@@ -176,7 +176,7 @@ index 8903d4dbcfa72c6739d5170ff826a35fb5c5af7e..c6347cd51659c1cde6d190ad189bf286
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public int raidCooldownSeconds = 0;
@@ -198,6 +199,7 @@ public class PurpurWorldConfig {
@@ -210,6 +211,7 @@ public class PurpurWorldConfig {
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

4
patches/server/0120-Flying-squids-Oh-my.patch
View File

@@ -38,10 +38,10 @@ index 70b952f10a2af547f58069977ee135469d02f84d..cee226501690e1c00983a01ac82bc738
float f1 = MathHelper.cos(f) * 0.2F;
float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c6347cd51659c1cde6d190ad189bf286843f86d7..67ebb64ee44787dd6093830fb3df5aab7b993066 100644
index 643dfd2f50939708fa6f3127ca371674f69f6527..06c23ba2eefd1ed6b0deddd3aee3604fae58f493 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -865,10 +865,12 @@ public class PurpurWorldConfig {
@@ -877,10 +877,12 @@ public class PurpurWorldConfig {
public boolean squidRidable = false;
public boolean squidImmuneToEAR = true;
public double squidOffsetWaterCheck = 0.0D;

4
patches/server/0121-Infinity-bow-settings.patch
View File

@@ -26,10 +26,10 @@ index dd6a93dc78a4589f2c65d1738c432def1285f3e2..8241f3dafa5852bed7a3967e7260b36f
entityhuman.b(StatisticList.ITEM_USED.b(this));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 67ebb64ee44787dd6093830fb3df5aab7b993066..1bda25f2cd643280e675cccac7150844bfcb6649 100644
index 06c23ba2eefd1ed6b0deddd3aee3604fae58f493..52d172109df33fc96ddf00b340997f61a6f247ef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -153,6 +153,15 @@ public class PurpurWorldConfig {
@@ -165,6 +165,15 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}

4
patches/server/0122-Stonecutter-damage.patch
View File

@@ -39,10 +39,10 @@ index 33804e68931e8b4145b896eedeab79bde78779f2..fabadcd7a21b0e4ad0e2eeadcd8926df
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1bda25f2cd643280e675cccac7150844bfcb6649..c59b9ef3cb8cf72d51de18db860945150a67b4d8 100644
index 52d172109df33fc96ddf00b340997f61a6f247ef..0ed9e5998d00365da1cca37c9980ff0c97b1549a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -371,6 +371,11 @@ public class PurpurWorldConfig {
@@ -383,6 +383,11 @@ public class PurpurWorldConfig {
spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone);
}

2
patches/server/0123-Configurable-daylight-cycle.patch
View File

@@ -74,7 +74,7 @@ index 7ee7975d5569d24c836018e240ebd785a9e8fed5..6d5616dc4a899a1c01a21daece17f1c2
public void doMobSpawning(boolean flag, boolean flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c59b9ef3cb8cf72d51de18db860945150a67b4d8..51033af55d58a7afe86f9a5d174d7b01e45b2990 100644
index 0ed9e5998d00365da1cca37c9980ff0c97b1549a..4143e6d4900e1a774804e2ef69a820274cd36af1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,13 @@ public class PurpurWorldConfig {

4
patches/server/0125-Infinite-fuel-furnace.patch
View File

@@ -41,10 +41,10 @@ index e75e676d196d9f5a3409ec50645fab611b0afdad..76ea1d003b43d822e2b85eec3b874015
if (flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 51033af55d58a7afe86f9a5d174d7b01e45b2990..8d52a62927270269df906edd9b44e9534f5e3a2b 100644
index 4143e6d4900e1a774804e2ef69a820274cd36af1..ac6db65af48222bb3d5c2234e42eb57ef2c1588d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -339,6 +339,11 @@ public class PurpurWorldConfig {
@@ -351,6 +351,11 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

4
patches/server/0128-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
View File

@@ -24,10 +24,10 @@ index 8dd48669c29dd51ed4d535dad0b0319f4bb2250c..099e0d3df219408ebe2a741a02e53eb9
return;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8d52a62927270269df906edd9b44e9534f5e3a2b..f45ec0330d8a33d4b2af782faa0bcb6080ed407e 100644
index ac6db65af48222bb3d5c2234e42eb57ef2c1588d..1db3c53b64a8cdd487e8672befa72fdda8eb30e5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -335,8 +335,10 @@ public class PurpurWorldConfig {
@@ -347,8 +347,10 @@ public class PurpurWorldConfig {
}
public boolean farmlandGetsMoistFromBelow = false;

6
patches/server/0129-Add-adjustable-breeding-cooldown-to-config.patch
View File

@@ -94,10 +94,10 @@ index aa1b037c0103552761b81318f1d2ad8215bd0370..91aa8a2bc111ee6935ada0ae471fe1a3
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f45ec0330d8a33d4b2af782faa0bcb6080ed407e..4f294eaff1e7c1c315315ae03d207bd1621d7d4e 100644
index 1db3c53b64a8cdd487e8672befa72fdda8eb30e5..bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -208,6 +208,7 @@ public class PurpurWorldConfig {
@@ -220,6 +220,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public int raidCooldownSeconds = 0;
@@ -105,7 +105,7 @@ index f45ec0330d8a33d4b2af782faa0bcb6080ed407e..4f294eaff1e7c1c315315ae03d207bd1
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
@@ -219,6 +220,7 @@ public class PurpurWorldConfig {
@@ -231,6 +232,7 @@ public class PurpurWorldConfig {
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);

34
patches/server/0130-Make-animal-breeding-times-configurable.patch
View File

@@ -398,10 +398,10 @@ index 9ae7168595dd66860e09ef87f946b18b010e54b1..6c25f667eecdf345289a0dbf885c9d71
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151acc116174f 100644
index bc2b6e5b1b7253a64224f39ab0d39bcbd2e77996..280cc66097fc2161a5905ae3e308b0571172afe0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -422,10 +422,12 @@ public class PurpurWorldConfig {
@@ -434,10 +434,12 @@ public class PurpurWorldConfig {
public boolean beeRidable = false;
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
@@ -414,7 +414,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean blazeRidable = false;
@@ -442,12 +444,14 @@ public class PurpurWorldConfig {
@@ -454,12 +456,14 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -429,7 +429,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean caveSpiderRidable = false;
@@ -460,10 +464,12 @@ public class PurpurWorldConfig {
@@ -472,10 +476,12 @@ public class PurpurWorldConfig {
public boolean chickenRidable = false;
public boolean chickenRidableInWater = false;
public boolean chickenRetaliate = false;
@@ -442,7 +442,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean codRidable = false;
@@ -474,10 +480,12 @@ public class PurpurWorldConfig {
@@ -486,10 +492,12 @@ public class PurpurWorldConfig {
public boolean cowRidable = false;
public boolean cowRidableInWater = false;
public int cowFeedMushrooms = 0;
@@ -455,7 +455,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean creeperRidable = false;
@@ -505,8 +513,10 @@ public class PurpurWorldConfig {
@@ -517,8 +525,10 @@ public class PurpurWorldConfig {
}
public boolean donkeyRidableInWater = false;
@@ -466,7 +466,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean drownedRidable = false;
@@ -564,10 +574,12 @@ public class PurpurWorldConfig {
@@ -576,10 +586,12 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
public boolean foxTypeChangesWithTulips = false;
@@ -479,7 +479,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean ghastRidable = false;
@@ -612,14 +624,18 @@ public class PurpurWorldConfig {
@@ -624,14 +636,18 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
@@ -498,7 +498,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean huskRidable = false;
@@ -664,9 +680,11 @@ public class PurpurWorldConfig {
@@ -676,9 +692,11 @@ public class PurpurWorldConfig {
public boolean llamaRidable = false;
public boolean llamaRidableInWater = false;
@@ -510,7 +510,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean llamaTraderRidable = false;
@@ -685,28 +703,36 @@ public class PurpurWorldConfig {
@@ -697,28 +715,36 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
@@ -547,7 +547,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean parrotRidable = false;
@@ -770,10 +796,12 @@ public class PurpurWorldConfig {
@@ -782,10 +808,12 @@ public class PurpurWorldConfig {
public boolean pigRidable = false;
public boolean pigRidableInWater = false;
public boolean pigGiveSaddleBack = false;
@@ -560,7 +560,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean piglinRidable = false;
@@ -801,12 +829,14 @@ public class PurpurWorldConfig {
@@ -813,12 +841,14 @@ public class PurpurWorldConfig {
public boolean polarBearRidableInWater = false;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -575,7 +575,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean pufferfishRidable = false;
@@ -818,11 +848,13 @@ public class PurpurWorldConfig {
@@ -830,11 +860,13 @@ public class PurpurWorldConfig {
public boolean rabbitRidableInWater = false;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -589,7 +589,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean ravagerRidable = false;
@@ -839,9 +871,11 @@ public class PurpurWorldConfig {
@@ -851,9 +883,11 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
@@ -601,7 +601,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean shulkerRidable = false;
@@ -919,9 +953,11 @@ public class PurpurWorldConfig {
@@ -931,9 +965,11 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
@@ -613,7 +613,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean tropicalFishRidable = false;
@@ -931,9 +967,11 @@ public class PurpurWorldConfig {
@@ -943,9 +979,11 @@ public class PurpurWorldConfig {
public boolean turtleRidable = false;
public boolean turtleRidableInWater = false;
@@ -625,7 +625,7 @@ index 4f294eaff1e7c1c315315ae03d207bd1621d7d4e..0aebad8a3610fe59943eff50b1d151ac
}
public boolean vexRidable = false;
@@ -1026,9 +1064,11 @@ public class PurpurWorldConfig {
@@ -1038,9 +1076,11 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;

6
patches/server/0131-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -188,7 +188,7 @@ index a4edfb02fd350433020b0f3699726b6127ab9933..3f9062d8eca3ce53c0fb9e9e40330aa4
NBTTagCompound nbttagcompound = this.a("display");
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0aebad8a3610fe59943eff50b1d151acc116174f..86be75baf3e5d0d2e350a30fc0dbb13fd220ec41 100644
index 280cc66097fc2161a5905ae3e308b0571172afe0..14440adbca4d589e172e67b669d4d5799286d085 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -83,8 +83,10 @@ public class PurpurWorldConfig {
@@ -202,7 +202,7 @@ index 0aebad8a3610fe59943eff50b1d151acc116174f..86be75baf3e5d0d2e350a30fc0dbb13f
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}
@@ -205,6 +207,7 @@ public class PurpurWorldConfig {
@@ -217,6 +219,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
@@ -210,7 +210,7 @@ index 0aebad8a3610fe59943eff50b1d151acc116174f..86be75baf3e5d0d2e350a30fc0dbb13f
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
public int raidCooldownSeconds = 0;
@@ -217,6 +220,7 @@ public class PurpurWorldConfig {
@@ -229,6 +232,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);

2
patches/server/0132-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
View File

@@ -21,7 +21,7 @@ index 01163ce38602f9345f00ee0535b4e73be7c6d735..a7efce97318fcf95d98f33ad4ac2da69
((EntityInsentient) entityliving).setPersistent();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 86be75baf3e5d0d2e350a30fc0dbb13fd220ec41..c105c0192ad5bb5bf435bd318e0ecc89a486539a 100644
index 14440adbca4d589e172e67b669d4d5799286d085..3d3d718bff710f0ea9e699e2acc82c4c68e65f3d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -84,9 +84,11 @@ public class PurpurWorldConfig {

4
patches/server/0133-Add-twisting-and-weeping-vines-growth-rates.patch
View File

@@ -67,10 +67,10 @@ index 23dca1940375d243531fc4a891f04e937ae2f48f..94ffadb91fec65a721cf0c8fa98bad70
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c105c0192ad5bb5bf435bd318e0ecc89a486539a..5a639b538d2f7b16d9d4e9e7acb8c20f80561a86 100644
index 3d3d718bff710f0ea9e699e2acc82c4c68e65f3d..bc09361580b85c3eff533c6dd245e8fc219f2a5f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -407,6 +407,16 @@ public class PurpurWorldConfig {
@@ -419,6 +419,16 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0134-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
View File

@@ -89,10 +89,10 @@ index 94ffadb91fec65a721cf0c8fa98bad708a2ca269..067df63ab27ecb9fe0a0d012b16efbd5
// Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5a639b538d2f7b16d9d4e9e7acb8c20f80561a86..a8dc6bdc1f789a755b96fd4976d01820ebf139af 100644
index bc09361580b85c3eff533c6dd245e8fc219f2a5f..1f00fc0aede9841316830bc350ec9a4db0881764 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -354,6 +354,11 @@ public class PurpurWorldConfig {
@@ -366,6 +366,11 @@ public class PurpurWorldConfig {
furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel);
}
@@ -104,7 +104,7 @@ index 5a639b538d2f7b16d9d4e9e7acb8c20f80561a86..a8dc6bdc1f789a755b96fd4976d01820
public boolean lavaInfinite = false;
public int lavaInfiniteRequiredSources = 2;
public int lavaSpeedNether = 10;
@@ -408,13 +413,17 @@ public class PurpurWorldConfig {
@@ -420,13 +425,17 @@ public class PurpurWorldConfig {
}
public double twistingVinesGrowthModifier = 0.10D;

4
patches/server/0135-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
View File

@@ -21,10 +21,10 @@ index 995849212c25568d3aa28ada78babf8b8e669960..acb2b3ed04ea0bf19335415310ce22cd
static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a8dc6bdc1f789a755b96fd4976d01820ebf139af..4ffb31d5a8f48b9511b7d55c4ae5574c61784e85 100644
index 1f00fc0aede9841316830bc350ec9a4db0881764..858363deaad76ea1837f90394a1009db6a42a166 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -576,10 +576,12 @@ public class PurpurWorldConfig {
@@ -588,10 +588,12 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public boolean endermanAllowGriefing = true;

4
patches/server/0137-Add-configurable-snowball-damage.patch
View File

@@ -18,10 +18,10 @@ index 34a5f481e6ed1357861dca15fb4013ec8484a292..d7bab4446a5a8eef98c10b1f6eb89de9
entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4ffb31d5a8f48b9511b7d55c4ae5574c61784e85..942ae49ad2218c6b5867aac2e1f04b33cd342757 100644
index 858363deaad76ea1837f90394a1009db6a42a166..f4abaeaa36f97c8cae0507c7746cd960a5fc35fc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -202,6 +202,11 @@ public class PurpurWorldConfig {
@@ -214,6 +214,11 @@ public class PurpurWorldConfig {
witherSkullDespawnRate = getInt("gameplay-mechanics.projectile-despawn-rates.wither_skull", witherSkullDespawnRate);
}

6
patches/server/0138-Zombie-break-door-minimum-difficulty-option.patch
View File

@@ -40,7 +40,7 @@ index 7488a12926c5ee4adc3bc1fa3973988350381544..23870a271b759a953a095df835e08ea2
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 942ae49ad2218c6b5867aac2e1f04b33cd342757..1631d0f96f5c6a8ea569badb52e32ad70a01e832 100644
index f4abaeaa36f97c8cae0507c7746cd960a5fc35fc..afe772f6249f3901a5057684fcce89053237bc13 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur;
@@ -51,7 +51,7 @@ index 942ae49ad2218c6b5867aac2e1f04b33cd342757..1631d0f96f5c6a8ea569badb52e32ad7
import net.minecraft.server.Explosion;
import net.minecraft.server.IRegistry;
import net.minecraft.server.Item;
@@ -1116,6 +1117,7 @@ public class PurpurWorldConfig {
@@ -1128,6 +1129,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -59,7 +59,7 @@ index 942ae49ad2218c6b5867aac2e1f04b33cd342757..1631d0f96f5c6a8ea569badb52e32ad7
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1123,6 +1125,11 @@ public class PurpurWorldConfig {
@@ -1135,6 +1137,11 @@ 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);

2
patches/server/0142-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -18,7 +18,7 @@ index 475741612979fa16dd29df3aea9764d501be988a..947c9fb574f111e3edfadab3c3e120b8
} else {
this.setLeftHanded(false);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1631d0f96f5c6a8ea569badb52e32ad70a01e832..6afb5179323922fd8cabbf6f9e3edca6f2745f87 100644
index afe772f6249f3901a5057684fcce89053237bc13..39d8752a673f10cd95a28e091ab8d5d7f626ebbd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -129,8 +129,10 @@ public class PurpurWorldConfig {

6
patches/server/0143-Add-boat-fall-damage-config.patch
View File

@@ -27,10 +27,10 @@ index d01dd1b4b561cda65c247d7775b7e8e1e503cbda..53125d7fc29e87f4bbf37ee77518222f
if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6afb5179323922fd8cabbf6f9e3edca6f2745f87..0b3dd97e2c9fcfecc2468aa6677cfe905125e9f3 100644
index 39d8752a673f10cd95a28e091ab8d5d7f626ebbd..904a49a96a6b410046846ec48a3d1817d1d6879d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -212,6 +212,7 @@ public class PurpurWorldConfig {
@@ -224,6 +224,7 @@ public class PurpurWorldConfig {
public boolean useBetterMending = false;
public boolean boatEjectPlayersOnLand = false;
@@ -38,7 +38,7 @@ index 6afb5179323922fd8cabbf6f9e3edca6f2745f87..0b3dd97e2c9fcfecc2468aa6677cfe90
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean entitiesCanUsePortals = true;
@@ -225,6 +226,7 @@ public class PurpurWorldConfig {
@@ -237,6 +238,7 @@ public class PurpurWorldConfig {
private void miscGameplayMechanicsSettings() {
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);

2
patches/server/0144-Config-migration-disable-saving-projectiles-to-disk-.patch
View File

@@ -36,7 +36,7 @@ index 9294bfab12ef88690e359ff90551c5c615cdd3dd..e928716d7a2dcb390507b746763e6f7e
public static String afkBroadcastBack = "§e§o%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0b3dd97e2c9fcfecc2468aa6677cfe905125e9f3..faa2253508aa40ed2c1838044a2b6bdd5599e374 100644
index 904a49a96a6b410046846ec48a3d1817d1d6879d..22a930a42e10447216c6c60bab5772f1c7c2fed1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,6 @@

4
patches/server/0145-Snow-Golem-rate-of-fire-config.patch
View File

@@ -23,10 +23,10 @@ index e980da14cf4f34c87a88ffd2b908223808404966..e5b3d298f52006f39a36cfdd95097e7b
this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index faa2253508aa40ed2c1838044a2b6bdd5599e374..2b47d49710105b406c5bbbc9188bd1bb54eb0872 100644
index 22a930a42e10447216c6c60bab5772f1c7c2fed1..6794e9f57ec599128c9b65f2940f71f230f2715a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -967,12 +967,20 @@ public class PurpurWorldConfig {
@@ -979,12 +979,20 @@ public class PurpurWorldConfig {
public boolean snowGolemLeaveTrailWhenRidden = false;
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemPutPumpkinBack = false;

2
patches/server/0148-Config-migration-climbing-should-not-bypass-cramming.patch
View File

@@ -28,7 +28,7 @@ index 7aee1687571010da55e8bb776ec1c658748e979a..645213cacb6061f84da7a1c9d6f2fa94
public static String afkBroadcastBack = "§e§o%s is no longer AFK";
public static String afkTabListPrefix = "[AFK] ";
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2b47d49710105b406c5bbbc9188bd1bb54eb0872..279ae8d3158362a3672c8302aeec9bf9fb595963 100644
index 6794e9f57ec599128c9b65f2940f71f230f2715a..3bcf4a471ed4eb049e5facb3bfb22f133d0444a3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,6 +96,17 @@ public class PurpurWorldConfig {

6
patches/server/0149-Lobotomize-stuck-villagers.patch
View File

@@ -88,10 +88,10 @@ index b92ca4a6de01f3f86367fb8dfe3591b08a3e9218..1208464fba96daf276c9cc0c1c9b18db
// Paper start - add target parameter
return this.a(blockposition, null, i);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 279ae8d3158362a3672c8302aeec9bf9fb595963..1501e922935e12ca847307b514c02c08c9c80d1c 100644
index 3bcf4a471ed4eb049e5facb3bfb22f133d0444a3..7bc193aae13003a2094b937c2899c55dfb9a5107 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1061,6 +1061,8 @@ public class PurpurWorldConfig {
@@ -1073,6 +1073,8 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -100,7 +100,7 @@ index 279ae8d3158362a3672c8302aeec9bf9fb595963..1501e922935e12ca847307b514c02c08
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1072,6 +1074,13 @@ public class PurpurWorldConfig {
@@ -1084,6 +1086,13 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);

6
patches/server/0150-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -234,10 +234,10 @@ index 3c60da7ac6faebe9d964e893974e42613c59b4c1..6493f220a0cf627e82e5f3f3c85e9934
public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN);
public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1501e922935e12ca847307b514c02c08c9c80d1c..2e1375f0d0b21806d29926d706adf350aba9267c 100644
index 7bc193aae13003a2094b937c2899c55dfb9a5107..110690251fc3e76f7f16f5614e1dca3c0754ebb8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1063,6 +1063,8 @@ public class PurpurWorldConfig {
@@ -1075,6 +1075,8 @@ public class PurpurWorldConfig {
public boolean villagerCanBreed = true;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheck = 60;
@@ -246,7 +246,7 @@ index 1501e922935e12ca847307b514c02c08c9c80d1c..2e1375f0d0b21806d29926d706adf350
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1081,6 +1083,8 @@ public class PurpurWorldConfig {
@@ -1093,6 +1095,8 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);

4
patches/server/0151-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
View File

@@ -35,10 +35,10 @@ index 3327dbbf87d8f43cbc7cd728df2f4c6a33dae40d..57f3358b8dfd53f5b1d2e976d64b809f
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2e1375f0d0b21806d29926d706adf350aba9267c..f628d0ee73007338e50d8fd28687bf474d79f762 100644
index 110690251fc3e76f7f16f5614e1dca3c0754ebb8..3a58c970dae6dca0a97e7f2ed3eb0bcadcd65e4a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1194,12 +1194,14 @@ public class PurpurWorldConfig {
@@ -1206,12 +1206,14 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyOnlyBaby = true;
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;

4
patches/server/0153-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -201,10 +201,10 @@ index 9a4819815c7a4bf2fd4a92c4169ace35f2261704..da29898574d30d5fecc5a44ad7b36556
public PathfinderGoalAvoidTarget(EntityCreature entitycreature, Class<T> oclass, Predicate<EntityLiving> predicate, float f, double d0, double d1, Predicate<EntityLiving> predicate1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f628d0ee73007338e50d8fd28687bf474d79f762..bad50d5d4f6b32fbfe2988471d71e91108a5ffb3 100644
index 3a58c970dae6dca0a97e7f2ed3eb0bcadcd65e4a..533e9aedc69645e6c2d16dbf2abb767b9826feb6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1145,10 +1145,14 @@ public class PurpurWorldConfig {
@@ -1157,10 +1157,14 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;

4
patches/server/0154-Configurable-default-wolf-collar-color.patch
View File

@@ -24,7 +24,7 @@ index 5fe2e9f4bfbdc08690eacd6196e59529dc7953e8..fd62dc51258876275adbe02f750fd881
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bad50d5d4f6b32fbfe2988471d71e91108a5ffb3..7850a2e674d9c016c02ea5bbf41aaf998a21cbb5 100644
index 533e9aedc69645e6c2d16dbf2abb767b9826feb6..2d177f9583798d56fae2d08ad2b4805a91585698 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -3,6 +3,7 @@ package net.pl3x.purpur;
@@ -35,7 +35,7 @@ index bad50d5d4f6b32fbfe2988471d71e91108a5ffb3..7850a2e674d9c016c02ea5bbf41aaf99
import net.minecraft.server.EnumDifficulty;
import net.minecraft.server.Explosion;
import net.minecraft.server.IRegistry;
@@ -1145,12 +1146,18 @@ public class PurpurWorldConfig {
@@ -1157,12 +1158,18 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;

52
patches/server/0155-Configurable-entity-base-attributes.patch
View File

@@ -1314,10 +1314,10 @@ index 0c47477b416980d2e932321730525bf5a8feda4f..dc850677c29c16805f28af00b2a63363
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e11324417e8f3 100644
index 2d177f9583798d56fae2d08ad2b4805a91585698..555121ff9f3b6b666a5e1396d04870d6d725df75 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -472,30 +472,58 @@ public class PurpurWorldConfig {
@@ -484,30 +484,58 @@ public class PurpurWorldConfig {
public boolean batRidable = false;
public boolean batRidableInWater = false;
public double batMaxY = 256D;
@@ -1376,7 +1376,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean catRidable = false;
@@ -504,6 +532,7 @@ public class PurpurWorldConfig {
@@ -516,6 +544,7 @@ public class PurpurWorldConfig {
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -1384,7 +1384,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -511,51 +540,92 @@ public class PurpurWorldConfig {
@@ -523,51 +552,92 @@ public class PurpurWorldConfig {
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks);
@@ -1477,7 +1477,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean dolphinRidable = false;
@@ -563,19 +633,45 @@ public class PurpurWorldConfig {
@@ -575,19 +645,45 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public boolean dolphinDisableTreasureSearching = false;
@@ -1523,7 +1523,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean drownedRidable = false;
@@ -583,73 +679,135 @@ public class PurpurWorldConfig {
@@ -595,73 +691,135 @@ public class PurpurWorldConfig {
public boolean drownedJockeyOnlyBaby = true;
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
@@ -1659,7 +1659,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean giantRidable = false;
@@ -672,31 +830,68 @@ public class PurpurWorldConfig {
@@ -684,31 +842,68 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.giant.max-health", giantMaxHealth);
@@ -1730,7 +1730,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean huskRidable = false;
@@ -704,12 +899,21 @@ public class PurpurWorldConfig {
@@ -716,12 +911,21 @@ public class PurpurWorldConfig {
public boolean huskJockeyOnlyBaby = true;
public double huskJockeyChance = 0.05D;
public boolean huskJockeyTryExistingChickens = true;
@@ -1752,7 +1752,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean illusionerRidable = false;
@@ -724,85 +928,188 @@ public class PurpurWorldConfig {
@@ -736,85 +940,188 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.illusioner.max-health", illusionerMaxHealth);
@@ -1943,7 +1943,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean phantomRidable = false;
@@ -828,6 +1135,7 @@ public class PurpurWorldConfig {
@@ -840,6 +1147,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -1951,7 +1951,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -852,38 +1160,72 @@ public class PurpurWorldConfig {
@@ -864,38 +1172,72 @@ public class PurpurWorldConfig {
phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
@@ -2024,7 +2024,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean polarBearRidable = false;
@@ -891,6 +1233,7 @@ public class PurpurWorldConfig {
@@ -903,6 +1245,7 @@ public class PurpurWorldConfig {
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
@@ -2032,7 +2032,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -898,11 +1241,24 @@ public class PurpurWorldConfig {
@@ -910,11 +1253,24 @@ public class PurpurWorldConfig {
Item item = IRegistry.ITEM.get(new MinecraftKey(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
@@ -2057,7 +2057,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean rabbitRidable = false;
@@ -910,68 +1266,142 @@ public class PurpurWorldConfig {
@@ -922,68 +1278,142 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -2200,7 +2200,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean snowGolemRidable = false;
@@ -983,6 +1413,7 @@ public class PurpurWorldConfig {
@@ -995,6 +1425,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -2208,7 +2208,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -993,63 +1424,118 @@ public class PurpurWorldConfig {
@@ -1005,63 +1436,118 @@ 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);
@@ -2327,7 +2327,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean villagerRidable = false;
@@ -1066,6 +1552,7 @@ public class PurpurWorldConfig {
@@ -1078,6 +1564,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -2335,7 +2335,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1086,33 +1573,60 @@ public class PurpurWorldConfig {
@@ -1098,33 +1585,60 @@ 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);
@@ -2396,7 +2396,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean witherRidable = false;
@@ -1129,19 +1643,30 @@ public class PurpurWorldConfig {
@@ -1141,19 +1655,30 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.wither.max-health", witherMaxHealth);
@@ -2429,7 +2429,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean wolfRidable = false;
@@ -1150,6 +1675,7 @@ public class PurpurWorldConfig {
@@ -1162,6 +1687,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2437,7 +2437,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1161,13 +1687,26 @@ public class PurpurWorldConfig {
@@ -1173,13 +1699,26 @@ public class PurpurWorldConfig {
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2464,7 +2464,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean zombieRidable = false;
@@ -1177,6 +1716,8 @@ public class PurpurWorldConfig {
@@ -1189,6 +1728,8 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public EnumDifficulty zombieBreakDoorMinDifficulty = EnumDifficulty.HARD;
@@ -2473,7 +2473,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1189,15 +1730,40 @@ public class PurpurWorldConfig {
@@ -1201,15 +1742,40 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = EnumDifficulty.HARD;
}
@@ -2514,7 +2514,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean zombifiedPiglinRidable = false;
@@ -1206,6 +1772,8 @@ public class PurpurWorldConfig {
@@ -1218,6 +1784,8 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2523,7 +2523,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1213,6 +1781,13 @@ public class PurpurWorldConfig {
@@ -1225,6 +1793,13 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
@@ -2537,7 +2537,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean zombieVillagerRidable = false;
@@ -1220,11 +1795,20 @@ public class PurpurWorldConfig {
@@ -1232,11 +1807,20 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;

6
patches/server/0156-Phantom-flames-on-swoop.patch
View File

@@ -17,10 +17,10 @@ index 25345d8d585735af407787f2c26fe92674721239..087a91fedc49aaf6e74b81b90494849c
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 983210d8ee7a89c5d2d7abdf4a6e11324417e8f3..340a5d9e05fe550994f4fab0aed9e42d8296c961 100644
index 555121ff9f3b6b666a5e1396d04870d6d725df75..e0f6b31cff0dbe99ed327fdb0df3caf1b0e392b9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1135,6 +1135,7 @@ public class PurpurWorldConfig {
@@ -1147,6 +1147,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -28,7 +28,7 @@ index 983210d8ee7a89c5d2d7abdf4a6e11324417e8f3..340a5d9e05fe550994f4fab0aed9e42d
public double phantomMaxHealth = 20.0D;
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
@@ -1160,6 +1161,7 @@ public class PurpurWorldConfig {
@@ -1172,6 +1173,7 @@ public class PurpurWorldConfig {
phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);

4
patches/server/0157-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -17,10 +17,10 @@ index c4ff93a6b908c1bd157c7fe45b504909b189d09c..71a32a317e38b9c8f802fd5dd9ae546f
return iblockaccess.getType(blockposition1).isOccluding(iblockaccess, blockposition1);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 340a5d9e05fe550994f4fab0aed9e42d8296c961..f589925a469388948b72564532abba14206f798b 100644
index e0f6b31cff0dbe99ed327fdb0df3caf1b0e392b9..9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -369,6 +369,11 @@ public class PurpurWorldConfig {
@@ -381,6 +381,11 @@ public class PurpurWorldConfig {
}
}

4
patches/server/0159-Striders-give-saddle-back.patch
View File

@@ -28,10 +28,10 @@ index a0bb64bea373c678c519e3fae8f808fd36e1ee4f..11911b10ddc6e2a681f2eda313a6e7c6
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f589925a469388948b72564532abba14206f798b..d30177ee1d80dcefb931e650fc90d6b174caa1b4 100644
index 9ccf82239a3c5ee319ef64e9e5519c563e8dbcbd..8aa4a08f4b8af273ea2f3e32066faec597e36015 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1488,11 +1488,13 @@ public class PurpurWorldConfig {
@@ -1500,11 +1500,13 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public int striderBreedingTicks = 6000;

4
patches/server/0161-Full-netherite-armor-grants-fire-resistance.patch
View File

@@ -26,10 +26,10 @@ index c973a1f1aecd47f11a12c94325cc18c3307d7ab5..91c2756a8708a2f4154905baec20b9ae
protected ItemCooldown i() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d30177ee1d80dcefb931e650fc90d6b174caa1b4..fc83177160b4c598e5e4101f4ffce33ce1c34e5f 100644
index 8aa4a08f4b8af273ea2f3e32066faec597e36015..abea37ca263b718f08ad3dd1f931acfb366962b8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -298,6 +298,19 @@ public class PurpurWorldConfig {
@@ -310,6 +310,19 @@ public class PurpurWorldConfig {
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
}

42
patches/server/0164-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -338,10 +338,10 @@ index c03ebbc933197be3e7097ea3f7b7cd08c90db7bb..37c1d1ac1bfcaf84d00135ad3c9d9e9b
} else if (this.c > 0) {
--this.c;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d06943ce81 100644
index abea37ca263b718f08ad3dd1f931acfb366962b8..6a63ea0dbc48c69ebb12bb19e2e832e78fea2726 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -240,6 +240,7 @@ public class PurpurWorldConfig {
@@ -252,6 +252,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean entitiesCanUsePortals = true;
@@ -349,7 +349,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
@@ -254,6 +255,7 @@ public class PurpurWorldConfig {
@@ -266,6 +267,7 @@ public class PurpurWorldConfig {
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -357,7 +357,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -394,9 +396,11 @@ public class PurpurWorldConfig {
@@ -406,9 +408,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -369,7 +369,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -455,10 +459,12 @@ public class PurpurWorldConfig {
@@ -467,10 +471,12 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -382,7 +382,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -730,12 +736,14 @@ public class PurpurWorldConfig {
@@ -742,12 +748,14 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -397,7 +397,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth);
set("mobs.ender_dragon.max-health", null);
@@ -751,12 +759,14 @@ public class PurpurWorldConfig {
@@ -763,12 +771,14 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public boolean endermanAllowGriefing = true;
@@ -412,7 +412,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.enderman.attributes.max-health", endermanMaxHealth);
@@ -782,10 +792,12 @@ public class PurpurWorldConfig {
@@ -794,10 +804,12 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
@@ -425,7 +425,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.evoker.attributes.max-health", evokerMaxHealth);
set("mobs.evoker.attributes.max-health", null);
@@ -796,12 +808,14 @@ public class PurpurWorldConfig {
@@ -808,12 +820,14 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
@@ -440,7 +440,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
if (PurpurConfig.version < 10) {
@@ -1236,10 +1250,12 @@ public class PurpurWorldConfig {
@@ -1248,10 +1262,12 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
@@ -453,7 +453,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.pillager.attributes.max-health", pillagerMaxHealth);
set("mobs.pillager.attributes.max-health", null);
@@ -1283,6 +1299,7 @@ public class PurpurWorldConfig {
@@ -1295,6 +1311,7 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
@@ -461,7 +461,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -1290,6 +1307,7 @@ public class PurpurWorldConfig {
@@ -1302,6 +1319,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 fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -1303,10 +1321,12 @@ public class PurpurWorldConfig {
@@ -1315,10 +1333,12 @@ public class PurpurWorldConfig {
public boolean ravagerRidable = false;
public boolean ravagerRidableInWater = false;
@@ -482,7 +482,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.ravager.attributes.max-health", ravagerMaxHealth);
set("mobs.ravager.attributes.max-health", null);
@@ -1330,11 +1350,13 @@ public class PurpurWorldConfig {
@@ -1342,11 +1362,13 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public int sheepBreedingTicks = 6000;
@@ -496,7 +496,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.sheep.attributes.max-health", sheepMaxHealth);
set("mobs.sheep.attributes.max-health", null);
@@ -1359,10 +1381,12 @@ public class PurpurWorldConfig {
@@ -1371,10 +1393,12 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
@@ -509,7 +509,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.silverfish.attributes.max-health", silverfishMaxHealth);
set("mobs.silverfish.attributes.max-health", null);
@@ -1427,6 +1451,7 @@ public class PurpurWorldConfig {
@@ -1439,6 +1463,7 @@ public class PurpurWorldConfig {
public boolean snowGolemRidable = false;
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
@@ -517,7 +517,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemPutPumpkinBack = false;
public int snowGolemSnowBallMin = 20;
@@ -1438,6 +1463,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1475,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 fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -1654,6 +1680,7 @@ public class PurpurWorldConfig {
@@ -1666,6 +1692,7 @@ public class PurpurWorldConfig {
public boolean witherRidable = false;
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
@@ -533,7 +533,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public double witherMaxHealth = 300.0D;
@@ -1661,6 +1688,7 @@ public class PurpurWorldConfig {
@@ -1673,6 +1700,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 fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
@@ -1733,6 +1761,7 @@ public class PurpurWorldConfig {
@@ -1745,6 +1773,7 @@ public class PurpurWorldConfig {
public boolean zombieRidable = false;
public boolean zombieRidableInWater = false;
@@ -549,7 +549,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -1743,6 +1772,7 @@ public class PurpurWorldConfig {
@@ -1755,6 +1784,7 @@ public class PurpurWorldConfig {
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);

6
patches/server/0165-Config-to-allow-Note-Block-sounds-when-blocked.patch
View File

@@ -22,10 +22,10 @@ index df69d00d3a38417e53f433cd1eb1f6cf3ec9b55b..6bb6e229c8734d7b9f4e3cd3dd1b4b64
org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.get(BlockNote.INSTRUMENT), data.get(BlockNote.NOTE));
if (!event.isCancelled()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 338073e3fe84c3b8fbf2b3d4d69ae0d06943ce81..b87da9465de98e7dd85ce3cf3a1ff61497aa6a58 100644
index 6a63ea0dbc48c69ebb12bb19e2e832e78fea2726..4d5d6102e3e9931086b1c6dfa1cf5031bb82f7c3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -242,6 +242,7 @@ public class PurpurWorldConfig {
@@ -254,6 +254,7 @@ public class PurpurWorldConfig {
public boolean entitiesCanUsePortals = true;
public boolean fireballsBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;
@@ -33,7 +33,7 @@ index 338073e3fe84c3b8fbf2b3d4d69ae0d06943ce81..b87da9465de98e7dd85ce3cf3a1ff614
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
@@ -257,6 +258,7 @@ public class PurpurWorldConfig {
@@ -269,6 +270,7 @@ public class PurpurWorldConfig {
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing);
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);

4
patches/server/0166-Add-EntityTeleportHinderedEvent.patch
View File

@@ -94,10 +94,10 @@ index ed8e91bf6c8b9d410d439bdddd5067d346a20a7e..127b5d8215f2bb4c5c523c5a77ebccfb
if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds
this.a((WorldServer) this.world);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b87da9465de98e7dd85ce3cf3a1ff61497aa6a58..2cde6a9dac0b0bab43f4362d31cc4d0865864731 100644
index 4d5d6102e3e9931086b1c6dfa1cf5031bb82f7c3..4d1851d23f27f58299f72f4bc14e7c99c69245d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1865,4 +1865,9 @@ public class PurpurWorldConfig {
@@ -1877,4 +1877,9 @@ public class PurpurWorldConfig {
zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
}

4
patches/server/0168-Farmland-trampling-changes.patch
View File

@@ -28,10 +28,10 @@ index 73dc0f499c456c21d298013fbab8c79ebcdecd6b..6b65a4b1845c6770f92ceebd04827595
if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) {
return;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2cde6a9dac0b0bab43f4362d31cc4d0865864731..9bd574150164d6a4f28dad65dc4b482589f534c2 100644
index 4d1851d23f27f58299f72f4bc14e7c99c69245d2..5699d54d9ffd1f194a22fe03ad4d144d3ad5a007 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -401,10 +401,14 @@ public class PurpurWorldConfig {
@@ -413,10 +413,14 @@ public class PurpurWorldConfig {
public boolean farmlandBypassMobGriefing = false;
public boolean farmlandGetsMoistFromBelow = false;
public boolean farmlandAlpha = false;

2
patches/server/0169-Movement-options-for-armour-stands.patch
View File

@@ -66,7 +66,7 @@ index e6de89e7f57c3c130dedb8407cd4cd577d394b9a..91df44d2e4f09fb612ae7bcb6c6a3dbb
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9bd574150164d6a4f28dad65dc4b482589f534c2..7ab156b7693d49dca1928580c23c302c90f3398e 100644
index 5699d54d9ffd1f194a22fe03ad4d144d3ad5a007..403c1a4db53ea9919d14910a7dd3db9e37040507 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,10 +111,16 @@ public class PurpurWorldConfig {

4
patches/server/0170-Fix-stuck-in-portals.patch
View File

@@ -37,10 +37,10 @@ index 53125d7fc29e87f4bbf37ee77518222f6be1a4f4..13b745b333137ed4d71755a0fc7b5f3f
// CraftBukkit end
this.spawnIn(worldserver);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7ab156b7693d49dca1928580c23c302c90f3398e..54d39ce779a0a4ae79b23a3cd98d3f9761d9c9e1 100644
index 403c1a4db53ea9919d14910a7dd3db9e37040507..1789c55df554335bacafba0b07bf10db09909693 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -338,6 +338,11 @@ public class PurpurWorldConfig {
@@ -350,6 +350,11 @@ public class PurpurWorldConfig {
});
}

4
patches/server/0172-Config-to-use-infinity-bows-without-arrows.patch
View File

@@ -20,10 +20,10 @@ index 8241f3dafa5852bed7a3967e7260b36f47198dba..edfb09fe673a9a7fe4e0410c0c0eeeda
} else {
entityhuman.c(enumhand);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 54d39ce779a0a4ae79b23a3cd98d3f9761d9c9e1..5d38992c909fd1caca2deb3496c8c314ef3db13b 100644
index 1789c55df554335bacafba0b07bf10db09909693..074ebb5ee808875b1a90b70e42ef440af002f5c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -197,10 +197,12 @@ public class PurpurWorldConfig {
@@ -209,10 +209,12 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}