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

Add configuration options for silk touch spawners

Browse Source
This commit is contained in:
William Blake Galbreath
2020-07-01 20:08:44 -05:00
parent 7503e60580
commit 0a94563749
37 changed files with 179 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
patches/server/0029-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From 6c9014787c2208705d67fad563db8b13bd7e186a Mon Sep 17 00:00:00 2001
From 6ac97172d3fcd533dec614e4f4de61e4443d9cc0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners
@@ -8,7 +8,8 @@ Subject: [PATCH] Silk touch spawners
.../net/minecraft/server/BlockMobSpawner.java | 35 +++++++++++++++++++
.../net/minecraft/server/ItemSpawner.java | 23 ++++++++++++
src/main/java/net/minecraft/server/Items.java | 2 +-
4 files changed, 60 insertions(+), 1 deletion(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 21 +++++++++++
5 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
@@ -24,7 +25,7 @@ index 81725611d..c7232047c 100644
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
float f = 0.5F;
diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
index 16f9fb8e5..cf059e982 100644
index 16f9fb8e5..c002a65cf 100644
--- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
+++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
@@ -11,6 +11,40 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -34,7 +35,7 @@ index 16f9fb8e5..cf059e982 100644
+ // Purpur start
+ @Override
+ public void a(World world, EntityHuman entityhuman, BlockPosition blockposition, IBlockData iblockdata, TileEntity tileentity, ItemStack itemstack) {
+ if (entityhuman.getBukkitEntity().hasPermission("purpur.drop.spawners") && isSilkTouch(itemstack)) {
+ if (world.purpurConfig.silkTouchEnabled && entityhuman.getBukkitEntity().hasPermission("purpur.drop.spawners") && isSilkTouch(world, itemstack)) {
+ MinecraftKey type = ((TileEntityMobSpawner) tileentity).getSpawner().getMobName();
+ if (type != null) {
+ ItemStack item = new ItemStack(Blocks.SPAWNER.getItem());
@@ -60,8 +61,8 @@ index 16f9fb8e5..cf059e982 100644
+ super.a(world, entityhuman, blockposition, iblockdata, tileentity, itemstack);
+ }
+
+ private boolean isSilkTouch(ItemStack itemstack) {
+ return itemstack != null && itemstack.getItem() == Items.DIAMOND_PICKAXE && EnchantmentManager.getEnchantmentLevel(Enchantments.SILK_TOUCH, itemstack) > 0;
+ private boolean isSilkTouch(World world, ItemStack itemstack) {
+ return itemstack != null && world.purpurConfig.silkTouchTools.contains(itemstack.getItem()) && EnchantmentManager.getEnchantmentLevel(Enchantments.SILK_TOUCH, itemstack) > 0;
+ }
+ // Purpur end
+
@@ -72,13 +73,13 @@ index 16f9fb8e5..cf059e982 100644
@Override
public int getExpDrop(IBlockData iblockdata, World world, BlockPosition blockposition, ItemStack itemstack) {
+ if (isSilkTouch(itemstack)) return 0; // Purpur
+ if (isSilkTouch(world, itemstack)) return 0; // Purpur
int i = 15 + world.random.nextInt(15) + world.random.nextInt(15);
return i;
diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
new file mode 100644
index 000000000..7dc68ffe9
index 000000000..babe8ad2c
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ItemSpawner.java
@@ -0,0 +1,23 @@
@@ -92,7 +93,7 @@ index 000000000..7dc68ffe9
+ @Override
+ protected boolean a(BlockPosition blockposition, World world, EntityHuman entityhuman, ItemStack itemstack, IBlockData iblockdata) {
+ boolean handled = super.a(blockposition, world, entityhuman, itemstack, iblockdata);
+ if (entityhuman.getBukkitEntity().hasPermission("purpur.place.spawners")) {
+ if (world.purpurConfig.silkTouchEnabled && entityhuman.getBukkitEntity().hasPermission("purpur.place.spawners")) {
+ TileEntity spawner = world.getTileEntity(blockposition);
+ if (spawner instanceof TileEntityMobSpawner && itemstack.hasTag()) {
+ NBTTagCompound tag = itemstack.getTag();
@@ -118,6 +119,45 @@ index 89a9eec99..619c40b27 100644
public static final Item cx = a(Blocks.OAK_STAIRS, CreativeModeTab.b);
public static final Item cy = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item cz = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 644501d5e..6ddd3442f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,12 @@
package net.pl3x.purpur;
+import net.minecraft.server.IRegistry;
+import net.minecraft.server.Item;
+import net.minecraft.server.Items;
+import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.ArrayList;
import java.util.List;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -75,6 +81,21 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}
+ public boolean silkTouchEnabled = false;
+ public List<Item> silkTouchTools = new ArrayList<Item>(){{
+ add(Items.IRON_PICKAXE);
+ add(Items.GOLDEN_PICKAXE);
+ add(Items.DIAMOND_PICKAXE);
+ add(Items.NETHERITE_PICKAXE);
+ }};
+ private void silkTouchSettings() {
+ silkTouchEnabled = getBoolean("gameplay-mechanics.silk-touch.enabled", silkTouchEnabled);
+ getList("gameplay-mechanics.silk-touch.tools", silkTouchTools).forEach(key -> {
+ Item item = IRegistry.ITEM.get(new MinecraftKey((String) key));
+ if (item != Items.AIR) silkTouchTools.add(item);
+ });
+ }
+
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
private void villagerSettings() {
--
2.26.2

8
patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch
View File

@@ -1,4 +1,4 @@
From 741df2b5d77b2223c04718fa78c8f19fead51cf3 Mon Sep 17 00:00:00 2001
From 3c49db7083cfbf60e190d0b5d5a81032ab0172c0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
@@ -38,11 +38,11 @@ index 553c8affa..92cca6c44 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 644501d5e..741de8c51 100644
index 6ddd3442f..9c006a2bd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -75,6 +75,15 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -96,6 +96,15 @@ public class PurpurWorldConfig {
});
}
+ public boolean turtleEggsBreakFromExpOrbs = true;

6
patches/server/0036-Giants-AI-settings.patch
View File

@@ -1,4 +1,4 @@
From 2698d48eacd93e24ab955acc6dbce9c3ff90693d Mon Sep 17 00:00:00 2001
From 7a13ed668c6e0c4ce443caeae5d2fa9c6db0a1a9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Giants AI settings
@@ -165,10 +165,10 @@ index a5262b88e..69901be8b 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 741de8c51..96f4edaa8 100644
index 9c006a2bd..68ebb723b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -84,6 +84,23 @@ public class PurpurWorldConfig {
@@ -105,6 +105,23 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0037-Illusioners-AI-settings.patch
View File

@@ -1,4 +1,4 @@
From c6e42066fb741bb97a427a00ed3d0d63fb29d96f Mon Sep 17 00:00:00 2001
From d6782e6bf8889dde1d5ad2dabd293a3e41ce7aef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 11:09:25 -0500
Subject: [PATCH] Illusioners AI settings
@@ -31,10 +31,10 @@ index 76fd0513f..1a5b9a0f0 100644
public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
this.setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.BOW));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 96f4edaa8..6855759ee 100644
index 68ebb723b..095f2b84b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,15 @@ public class PurpurWorldConfig {
@@ -122,6 +122,15 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
}

6
patches/server/0038-Zombie-horse-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 09696d5831ed23b189a48aa65ca0088888f14156 Mon Sep 17 00:00:00 2001
From 54973e071905628d7d8d834adf8c090e5c90518a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Zombie horse naturally spawn
@@ -38,10 +38,10 @@ index 578cc6888..ee95ed6fa 100644
EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.a((World) this);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6855759ee..07f3296c6 100644
index 095f2b84b..1845a67f9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,4 +116,9 @@ public class PurpurWorldConfig {
@@ -137,4 +137,9 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
}

6
patches/server/0039-Charged-creeper-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 95f4eaf182e502970e05b1cda5de1911ee283ce1 Mon Sep 17 00:00:00 2001
From 4842bbb64455711a174c66567b03435acf742416 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:37:44 -0600
Subject: [PATCH] Charged creeper naturally spawn
@@ -29,10 +29,10 @@ index 5e7f3af37..ec5287fa5 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 07f3296c6..d8e72bd7c 100644
index 1845a67f9..ad47d7115 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -84,6 +84,11 @@ public class PurpurWorldConfig {
@@ -105,6 +105,11 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -1,4 +1,4 @@
From a1a7daf8ae4503b74199ce17c1b7d9574de44ed7 Mon Sep 17 00:00:00 2001
From f5c4dc19aa94d5de83ce2f5a76b92882bc29a39f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:47:11 -0500
Subject: [PATCH] Rabbit naturally spawn toast and killer
@@ -41,10 +41,10 @@ index 00c9233f8..1be0f943b 100644
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d8e72bd7c..4ac9c9db5 100644
index ad47d7115..ddd883c3f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,13 @@ public class PurpurWorldConfig {
@@ -136,6 +136,13 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
}

6
patches/server/0042-Make-Iron-Golems-Swim.patch
View File

@@ -1,4 +1,4 @@
From 914df1970bc65b4f06588cb21d179f47ad654c5c Mon Sep 17 00:00:00 2001
From 9f62ed2c0597891b745edf902af3df0236018975 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 15 Jun 2019 03:12:15 -0500
Subject: [PATCH] Make Iron Golems Swim
@@ -21,10 +21,10 @@ index e38a675be..ab0731c2a 100644
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D, false));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4ac9c9db5..0eba948fd 100644
index ddd883c3f..2e75644c7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,11 @@ public class PurpurWorldConfig {
@@ -136,6 +136,11 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
}

6
patches/server/0044-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From 8b987119abc32fe686254fb78afd8e8902f5a961 Mon Sep 17 00:00:00 2001
From 143de3af8f18ae724f2224f91536a67e59c044d5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 15:56:22 -0500
Subject: [PATCH] Tulips change fox type
@@ -90,10 +90,10 @@ index 619c40b27..b5305eaa9 100644
public static final Item bq = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item br = a(Blocks.CORNFLOWER, CreativeModeTab.c);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0eba948fd..007da617a 100644
index 2e75644c7..2c2d1229d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -89,6 +89,11 @@ public class PurpurWorldConfig {
@@ -110,6 +110,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

21
patches/server/0045-Breedable-Polar-Bears.patch
View File

@@ -1,12 +1,12 @@
From d322c81aad3685053fdb6229dcadb438808e8fdf Mon Sep 17 00:00:00 2001
From 105de6d97b00aefab67fede0ec61daa641a844d6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:46:44 -0500
Subject: [PATCH] Breedable Polar Bears
---
.../net/minecraft/server/EntityPolarBear.java | 34 ++++++++++++++++++-
.../net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++
2 files changed, 46 insertions(+), 1 deletion(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 8 +++++
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index 69e5c1aed..6506e0055 100644
@@ -73,21 +73,10 @@ index 69e5c1aed..6506e0055 100644
this.datawatcher.set(EntityPolarBear.bv, flag);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 007da617a..fe7201939 100644
index 2c2d1229d..69bf1302d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,10 @@
package net.pl3x.purpur;
+import com.destroystokyo.paper.PaperWorldConfig;
+import net.minecraft.server.IRegistry;
+import net.minecraft.server.Item;
+import net.minecraft.server.Items;
+import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
import java.util.List;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -125,6 +130,14 @@ public class PurpurWorldConfig {
@@ -146,6 +146,14 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

6
patches/server/0046-Chickens-can-retaliate.patch
View File

@@ -1,4 +1,4 @@
From 786ef853ee3b3e82b0d4dd5f045ed02ef70e19ca Mon Sep 17 00:00:00 2001
From 601a751cb012f16e624eac1c16a9f75c3c7d88b4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 12 Apr 2020 13:19:34 -0500
Subject: [PATCH] Chickens can retaliate
@@ -57,10 +57,10 @@ index c6ee92343..fa97552bb 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fe7201939..56657c357 100644
index 69bf1302d..46bf6bcd8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -89,6 +89,11 @@ public class PurpurWorldConfig {
@@ -105,6 +105,11 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0047-Add-option-to-set-armorstand-step-height.patch
View File

@@ -1,4 +1,4 @@
From 8b35258b4e6dc36c81503d1a85d53cfae9625c6d Mon Sep 17 00:00:00 2001
From ced6e8afca35db154d628d4c700f5c943dcb5299 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 6 Oct 2019 12:46:35 -0500
Subject: [PATCH] Add option to set armorstand step height
@@ -21,10 +21,10 @@ index 250bccee4..7543f2cee 100644
if (!this.canTick) {
if (this.noTickPoseDirty) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 56657c357..90400b26f 100644
index 46bf6bcd8..4ab4c4cd6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -62,6 +62,11 @@ public class PurpurWorldConfig {
@@ -63,6 +63,11 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}

6
patches/server/0048-Cat-spawning-options.patch
View File

@@ -1,4 +1,4 @@
From da88862d2962b0393e49eff4976f1dfc94325589 Mon Sep 17 00:00:00 2001
From 78b40be871db9d14374f774fe9a396ef95b86727 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 18:52:55 -0600
Subject: [PATCH] Cat spawning options
@@ -119,10 +119,10 @@ index ee95ed6fa..918a82d46 100644
return this.getChunkProvider().j();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 90400b26f..013f3ba4d 100644
index 4ab4c4cd6..65bc882d8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -94,6 +94,15 @@ public class PurpurWorldConfig {
@@ -110,6 +110,15 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0050-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From e90551499231668e3dc14b45361a0ded003c1ac1 Mon Sep 17 00:00:00 2001
From b011e856139295bc76740c31217ae1a713bb2ccf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms
@@ -129,10 +129,10 @@ index 69901be8b..dd894c7ea 100644
public float aJ;
public float aK;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 013f3ba4d..8f9aa5283 100644
index 65bc882d8..0b79a7876 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -108,6 +108,11 @@ public class PurpurWorldConfig {
@@ -124,6 +124,11 @@ public class PurpurWorldConfig {
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
}

6
patches/server/0052-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From e75f4e76cc42d4b69d3c800d8b1259233841c06b Mon Sep 17 00:00:00 2001
From d5ab920d3240d88395e81eb9cbc0db42f0734ef8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 01:14:46 -0500
Subject: [PATCH] Pigs give saddle back
@@ -32,10 +32,10 @@ index cd0a94794..cf2df391a 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8f9aa5283..cc41c67f8 100644
index 0b79a7876..b799ea018 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -154,6 +154,11 @@ public class PurpurWorldConfig {
@@ -170,6 +170,11 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

6
patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch
View File

@@ -1,4 +1,4 @@
From 1f28d401cdd3db016f37f70cef4f62c6faf3e491 Mon Sep 17 00:00:00 2001
From f3e4c25a94b6d5395c4b1f1293264e8fa52c2ce5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:58:44 -0500
Subject: [PATCH] Snowman drop and put back pumpkin
@@ -47,10 +47,10 @@ index 15b886d9b..dfe615814 100644
return EnumInteractionResult.PASS;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cc41c67f8..76eff6baa 100644
index b799ea018..200c49ee8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -174,6 +174,13 @@ public class PurpurWorldConfig {
@@ -190,6 +190,13 @@ public class PurpurWorldConfig {
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
}

6
patches/server/0054-Ender-dragon-always-drop-egg.patch
View File

@@ -1,4 +1,4 @@
From 0d58ae055ab7be9765224cee5fb13ecf470199aa Mon Sep 17 00:00:00 2001
From 76a280f1a48a7da649c7d1f41c34ab72c7b7580a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 7 Feb 2020 04:42:57 -0600
Subject: [PATCH] Ender dragon always drop egg
@@ -22,10 +22,10 @@ index 69faefbdb..ecd6af04d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 76eff6baa..fc310302d 100644
index 200c49ee8..35d8e0c59 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,6 +118,11 @@ public class PurpurWorldConfig {
@@ -134,6 +134,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

6
patches/server/0055-Ender-dragon-always-drop-full-exp.patch
View File

@@ -1,4 +1,4 @@
From 2ec5767d24c8ee49d75f5cc64a29880d301820e9 Mon Sep 17 00:00:00 2001
From 694d49f088255ea5f912cf7d901ce5a2bc147a50 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 24 Aug 2019 14:42:54 -0500
Subject: [PATCH] Ender dragon always drop full exp
@@ -22,10 +22,10 @@ index 63a759cc1..08fa5a975 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index fc310302d..201e916d2 100644
index 35d8e0c59..b04159eb0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -119,8 +119,10 @@ public class PurpurWorldConfig {
@@ -135,8 +135,10 @@ public class PurpurWorldConfig {
}
public boolean enderDragonAlwaysDropsEggBlock = false;

8
patches/server/0056-Signs-editable-on-right-click.patch
View File

@@ -1,4 +1,4 @@
From c582a3d813ffc01bd8eb7ebe3be1778483e0e9a6 Mon Sep 17 00:00:00 2001
From f4504a3c1ef5906cb9fb96ef405923172bb900be Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 24 May 2019 02:39:25 -0500
Subject: [PATCH] Signs editable on right click
@@ -44,11 +44,11 @@ index c4b0d8720..e1ab29975 100644
// Paper start
//this.c = entityhuman;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 201e916d2..09a9e9b19 100644
index b04159eb0..8e735db2d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -85,6 +85,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -101,6 +101,11 @@ public class PurpurWorldConfig {
});
}
+ public boolean signRightClickEdit = false;

10
patches/server/0057-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 5632a01348b52cfaf94abc740bdcfa58556a546f Mon Sep 17 00:00:00 2001
From b7422f08be8c2954b4bee7633637dc052094725f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -96,11 +96,11 @@ index e1ab29975..1778c5474 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 09a9e9b19..91dcfe1c6 100644
index 8e735db2d..89c1ed77f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -85,9 +85,12 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -101,9 +101,12 @@ public class PurpurWorldConfig {
});
}
+ public boolean signAllowColors = false;
@@ -108,7 +108,7 @@ index 09a9e9b19..91dcfe1c6 100644
private void signSettings() {
+ signAllowColors = getBoolean("blocks.sign.allow-colors", signAllowColors);
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
+
+
}
public boolean turtleEggsBreakFromExpOrbs = true;

8
patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -1,4 +1,4 @@
From 40297ce082b3571bcc64e7a1ad0f0605c9489b0c Mon Sep 17 00:00:00 2001
From b886b0ac06829ede73a6a01842a3e23e7415f399 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 21 Jun 2019 14:37:10 -0500
Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -40,11 +40,11 @@ index a315e2628..8dd48669c 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 91dcfe1c6..6f8604c5c 100644
index 89c1ed77f..e0dbeaf06 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -85,6 +85,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -101,6 +101,11 @@ public class PurpurWorldConfig {
});
}
+ public boolean farmlandGetsMoistFromBelow = false;

18
patches/server/0059-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From e0798fdcdf2c55cf2e17ea5efcc61f5c1adade7b Mon Sep 17 00:00:00 2001
From 98634944afd36a98f3cf155a6f73d84007b6bd82 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -9,8 +9,8 @@ Subject: [PATCH] Controllable Minecarts
.../net/minecraft/server/EntityLiving.java | 6 +--
.../server/EntityMinecartAbstract.java | 38 +++++++++++++++++++
.../net/minecraft/server/ItemMinecart.java | 8 ++--
.../net/pl3x/purpur/PurpurWorldConfig.java | 32 ++++++++++++++++
6 files changed, 85 insertions(+), 6 deletions(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 31 +++++++++++++++
6 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 551ca4471..32757e231 100644
@@ -139,21 +139,21 @@ index dc7decb06..0da16c200 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6f8604c5c..64867b68d 100644
index e0dbeaf06..cf546b206 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,12 +1,18 @@
@@ -1,5 +1,7 @@
package net.pl3x.purpur;
import com.destroystokyo.paper.PaperWorldConfig;
+import net.minecraft.server.Block;
+import net.minecraft.server.Blocks;
import net.minecraft.server.IRegistry;
import net.minecraft.server.Item;
import net.minecraft.server.Items;
import net.minecraft.server.MinecraftKey;
@@ -7,7 +9,10 @@ import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
+
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@@ -161,7 +161,7 @@ index 6f8604c5c..64867b68d 100644
import static net.pl3x.purpur.PurpurConfig.log;
public class PurpurWorldConfig {
@@ -67,6 +73,32 @@ public class PurpurWorldConfig {
@@ -68,6 +73,32 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

6
patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch
View File

@@ -1,4 +1,4 @@
From 91b343ffcc7d5824106805315e6691a858bbb38d Mon Sep 17 00:00:00 2001
From 80faaf3c660d70c840ac9f23c60a1871f43a0ad7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 14 Jan 2020 19:43:40 -0600
Subject: [PATCH] Add wither skeleton takes wither damage option
@@ -21,10 +21,10 @@ index 1819432e1..f415775ea 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bdc6dc3e8..f60434669 100644
index 49f86a663..0659eaee7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -247,6 +247,11 @@ public class PurpurWorldConfig {
@@ -262,6 +262,11 @@ public class PurpurWorldConfig {
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
}

8
patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch
View File

@@ -1,4 +1,4 @@
From ef199323d2ecd67ab3248c5089800c06c3d407f0 Mon Sep 17 00:00:00 2001
From 0966b508a2e93cd6b8b928690767c6e44c7a778c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 26 Apr 2020 16:28:38 -0500
Subject: [PATCH] Add enderman and creeper griefing controls
@@ -43,10 +43,10 @@ index b61de3351..245fc38de 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 11c4742c2..f015c456f 100644
index 94c1be308..0849a1f89 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -167,8 +167,10 @@ public class PurpurWorldConfig {
@@ -182,8 +182,10 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
}
@@ -57,7 +57,7 @@ index 11c4742c2..f015c456f 100644
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -179,6 +181,11 @@ public class PurpurWorldConfig {
@@ -194,6 +196,11 @@ public class PurpurWorldConfig {
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
}

6
patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
View File

@@ -1,4 +1,4 @@
From cb4b26260622329c9395dc553eae15e1946ca124 Mon Sep 17 00:00:00 2001
From 1ada35e9fdc6d7ee2aca64d4195619b84243e3b1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Apr 2020 09:37:29 -0500
Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
@@ -22,10 +22,10 @@ index 54a555509..0ff202c0d 100644
} else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3f1c33b5f..cf9f33544 100644
index 93a0c4aef..068b18bbb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -253,9 +253,11 @@ public class PurpurWorldConfig {
@@ -268,9 +268,11 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;

6
patches/server/0075-Villagers-follow-emerald-blocks.patch
View File

@@ -1,4 +1,4 @@
From 17b932a2f016412c95602271454572ea71b699d4 Mon Sep 17 00:00:00 2001
From ef3e4a48b7e2a4f29cd09b33bc44e3425240a93c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:10:12 -0600
Subject: [PATCH] Villagers follow emerald blocks
@@ -54,10 +54,10 @@ index a0841cfaf..ab5e97e39 100644
this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cf9f33544..4c2398313 100644
index 068b18bbb..557becca6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -254,10 +254,17 @@ public class PurpurWorldConfig {
@@ -269,10 +269,17 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFarmingBypassMobGriefing = false;

6
patches/server/0076-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From 97c949e1962c25613f92616619f098d8bff6069d Mon Sep 17 00:00:00 2001
From 4433d954fa112760d0c914abef49348d67026b68 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 3 Oct 2019 18:08:03 -0500
Subject: [PATCH] Allow leashing villagers
@@ -57,10 +57,10 @@ index ab5e97e39..9985afb12 100644
@Override
public EntityAgeable createChild(EntityAgeable entityageable) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4c2398313..98f88be8b 100644
index 557becca6..5d9402127 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -253,17 +253,21 @@ public class PurpurWorldConfig {
@@ -268,17 +268,21 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;

6
patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -1,4 +1,4 @@
From a1754a7a370e7b99ceb2a670042bd30bfc09e945 Mon Sep 17 00:00:00 2001
From 25d58af919ad793570e61f80f039975083b9e497 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500
Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -22,10 +22,10 @@ index 97eb26482..86de40d15 100644
for (int i = 0; i < 10; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 98f88be8b..57f215572 100644
index 5d9402127..200564fef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -256,12 +256,16 @@ public class PurpurWorldConfig {
@@ -271,12 +271,16 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerFarmingBypassMobGriefing = false;
public boolean villagerFollowEmeraldBlock = false;

6
patches/server/0078-Implement-infinite-lava.patch
View File

@@ -1,4 +1,4 @@
From ee1cbcdd7ed3523252131249f35cf1d9b92b081e Mon Sep 17 00:00:00 2001
From 02ca690e74bede05b69267a3b90c5a6803d33726 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 23 Nov 2019 17:55:42 -0600
Subject: [PATCH] Implement infinite lava
@@ -55,10 +55,10 @@ index 29930e801..9e543449c 100644
protected boolean f() {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 57f215572..cbfeb352a 100644
index 200564fef..234359fd1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -133,6 +133,11 @@ public class PurpurWorldConfig {
@@ -148,6 +148,11 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

6
patches/server/0079-Make-lava-flow-speed-configurable.patch
View File

@@ -1,4 +1,4 @@
From ed3a4a07b4a0dfc0fef629ef7165d4d5d93787a7 Mon Sep 17 00:00:00 2001
From dd999dc8bc879a2629c212f3cb5fa152c983b163 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 11:31:36 -0600
Subject: [PATCH] Make lava flow speed configurable
@@ -22,10 +22,10 @@ index 9e543449c..fb501a6c5 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cbfeb352a..2ac578bda 100644
index 234359fd1..914d5857e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -134,8 +134,12 @@ public class PurpurWorldConfig {
@@ -149,8 +149,12 @@ public class PurpurWorldConfig {
}
public boolean lavaInfinite = false;

6
patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From 9212d4fbac057fa0bbb70f786a4c10fd2e1c22f6 Mon Sep 17 00:00:00 2001
From c54fa12c59963f837667f98adb92d9a90397da37 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 17 Aug 2019 15:27:09 -0500
Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -22,10 +22,10 @@ index b66059836..00b89746f 100644
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.m();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 199e0b8fe..006859cc1 100644
index 00b6f6317..51984a527 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -300,6 +300,11 @@ public class PurpurWorldConfig {
@@ -315,6 +315,11 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
}

8
patches/server/0084-Dispenser-curse-of-binding-protection.patch
View File

@@ -1,4 +1,4 @@
From d981fc197a4b22382002f37c6f251fee71984fae Mon Sep 17 00:00:00 2001
From d647c38d2b80c777f069a8439b088bc1200ed450 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 25 Aug 2019 00:09:52 -0500
Subject: [PATCH] Dispenser curse of binding protection
@@ -49,11 +49,11 @@ index 885458d54..c7d67d729 100644
return this.b;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 006859cc1..4d0687146 100644
index 51984a527..861034f29 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -139,6 +139,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -154,6 +154,11 @@ public class PurpurWorldConfig {
});
}
+ public boolean dispenserApplyCursedArmor = true;

8
patches/server/0088-Implement-bamboo-growth-settings.patch
View File

@@ -1,4 +1,4 @@
From 8177f00bda2be8ef2d8d5cbc6ce3f36fb79b2f2e Mon Sep 17 00:00:00 2001
From 141e162655aff17493f74e0e582e8c7b7a551978 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 20:57:29 -0500
Subject: [PATCH] Implement bamboo growth settings
@@ -67,11 +67,11 @@ index 14790c167..bac1b8b30 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5079bd0f6..6752119a7 100644
index 28693ffa6..b436e5ec1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -143,6 +143,13 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
@@ -158,6 +158,13 @@ public class PurpurWorldConfig {
});
}
+ public int bambooMaxHeight = 16;

22
patches/server/0092-Add-item-entity-options.patch
View File

@@ -1,13 +1,13 @@
From c8e390ea174ce6c8d02d78badc44b1073de1a9ad Mon Sep 17 00:00:00 2001
From 53ba13952b4beee3685e0b029c404df59310b974 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Feb 2020 15:54:08 -0600
Subject: [PATCH] Add item entity options
---
src/main/java/net/minecraft/server/Entity.java | 1 +
src/main/java/net/minecraft/server/EntityItem.java | 4 +++-
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 14 ++++++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
src/main/java/net/minecraft/server/Entity.java | 1 +
src/main/java/net/minecraft/server/EntityItem.java | 4 +++-
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++++++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7a4cc7c30..476ca65a4 100644
@@ -44,18 +44,10 @@ index a7860cb4d..77e970c30 100644
// CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c1faba57f..b0eac3dc9 100644
index edfb64bc5..7c8735e52 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -9,6 +9,7 @@ import net.minecraft.server.Items;
import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -99,6 +100,19 @@ public class PurpurWorldConfig {
@@ -99,6 +99,19 @@ public class PurpurWorldConfig {
}
}

10
patches/server/0094-Configurable-jockey-options.patch
View File

@@ -1,4 +1,4 @@
From 1a79c93d7b5429efd06aadad006fde39ad4e0aa1 Mon Sep 17 00:00:00 2001
From 71a8e2e8f7a577194ec192ef0bb1f7b3e88155d1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 21:39:32 -0500
Subject: [PATCH] Configurable jockey options
@@ -202,10 +202,10 @@ index 9b920332b..68fca8a8d 100644
public void saveData(NBTTagCompound nbttagcompound) {
super.saveData(nbttagcompound);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b0eac3dc9..982abc4f2 100644
index 7c8735e52..ef2f115e3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -241,6 +241,15 @@ public class PurpurWorldConfig {
@@ -255,6 +255,15 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -221,7 +221,7 @@ index b0eac3dc9..982abc4f2 100644
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
@@ -275,6 +284,15 @@ public class PurpurWorldConfig {
@@ -289,6 +298,15 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
}
@@ -237,7 +237,7 @@ index b0eac3dc9..982abc4f2 100644
public double illusionerMaxHealth = 32.0D;
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
@@ -346,12 +364,36 @@ public class PurpurWorldConfig {
@@ -360,12 +378,36 @@ public class PurpurWorldConfig {
}
public boolean zombieTargetTurtleEggs = true;

6
patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From 12f7259837f77bc389ee0bb398ec707acaac4fc1 Mon Sep 17 00:00:00 2001
From 26f0b485dd8ce9cc72cda77cf31d86f68abc6e27 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:26:06 -0500
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -336,10 +336,10 @@ index 3cb78924d..ec09ec241 100644
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 982abc4f2..9d33db49e 100644
index ef2f115e3..40aabda0b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -307,6 +307,15 @@ public class PurpurWorldConfig {
@@ -321,6 +321,15 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

6
patches/server/0097-Customizable-EnderDragon-Health.patch
View File

@@ -1,4 +1,4 @@
From ae1e8e2ff7b4ca7f2d78e21057b839d978b023cb Mon Sep 17 00:00:00 2001
From 1adc1134e6baf7af66f11ba599897a90596076e4 Mon Sep 17 00:00:00 2001
From: Jason Bierque <bierquejason@gmail.com>
Date: Wed, 1 Jul 2020 22:36:06 +0200
Subject: [PATCH] Customizable EnderDragon Health
@@ -30,10 +30,10 @@ index 08fa5a975..e08e6014f 100644
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 9d33db49e..57bfa4a46 100644
index 40aabda0b..c215985e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -252,9 +252,11 @@ public class PurpurWorldConfig {
@@ -266,9 +266,11 @@ public class PurpurWorldConfig {
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;