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

Remove left over debug message

Browse Source
This commit is contained in:
William Blake Galbreath
2020-07-01 21:32:51 -05:00
parent 29c272d868
commit 8e891339e8
34 changed files with 107 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From c3c4a34f5faa408e46a5ace127d5574ade5aee80 Mon Sep 17 00:00:00 2001
From f49cd2fcfc97aa16866e036a2b7064c37851d6f0 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,8 +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 +-
.../net/pl3x/purpur/PurpurWorldConfig.java | 23 ++++++++++++
5 files changed, 83 insertions(+), 1 deletion(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 22 ++++++++++++
5 files changed, 82 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
@@ -120,7 +120,7 @@ index 89a9eec99..619c40b27 100644
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 c7fb5a737..bb107a457 100644
index c7fb5a737..818c4da17 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,12 @@
@@ -136,7 +136,7 @@ index c7fb5a737..bb107a457 100644
import java.util.List;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -75,6 +81,23 @@ public class PurpurWorldConfig {
@@ -75,6 +81,22 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}
@@ -151,7 +151,6 @@ index c7fb5a737..bb107a457 100644
+ add("minecraft:diamond_pickaxe");
+ add("minecraft:netherite_pickaxe");
+ }}).forEach(key -> {
+ System.out.println(key);
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) silkTouchTools.add(item);
+ });

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

@@ -1,4 +1,4 @@
From 34055397fa238b1b4689d0abbd24c0a857b2b957 Mon Sep 17 00:00:00 2001
From a6b04cf596d49adc0ef0c5462069a563dd0fe8f1 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,10 +38,10 @@ 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 bb107a457..9b6c53db0 100644
index 818c4da17..88e271574 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,6 +98,15 @@ public class PurpurWorldConfig {
@@ -97,6 +97,15 @@ public class PurpurWorldConfig {
});
}

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

@@ -1,4 +1,4 @@
From c2fca687c9e90251444001c3c1804f9e3f4c0640 Mon Sep 17 00:00:00 2001
From 8c6e31aad5ddf16ee331bb670740abb2a83aaf8d 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 9b6c53db0..1efd334b8 100644
index 88e271574..b1aca6526 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -107,6 +107,23 @@ public class PurpurWorldConfig {
@@ -106,6 +106,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 73e87b68a332f71052babbac0b414f909ee49ea1 Mon Sep 17 00:00:00 2001
From 26de45c692600db72207e75ebd311b25a22fcede 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 1efd334b8..afe87bc22 100644
index b1aca6526..70f8feffb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -124,6 +124,15 @@ public class PurpurWorldConfig {
@@ -123,6 +123,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 49dc8e0872d749e8ce463b4939e79a19a7ffade5 Mon Sep 17 00:00:00 2001
From 8c1e548d96e6e9553e0b70b9a4d516bf25610f3c 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 afe87bc22..4c007ebbe 100644
index 70f8feffb..d0fd8f9cd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -139,4 +139,9 @@ public class PurpurWorldConfig {
@@ -138,4 +138,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 fed278c5a6d8631b1ae4c1ccac28384cdb2a6e4e Mon Sep 17 00:00:00 2001
From 36d9437ced879274d76a2b22d55b86d243afc227 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 4c007ebbe..1db33153c 100644
index d0fd8f9cd..5004d6f77 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -107,6 +107,11 @@ public class PurpurWorldConfig {
@@ -106,6 +106,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 e3396538e6e43249f593e3a5e525513514470e3a Mon Sep 17 00:00:00 2001
From 80ed95c455ffb5ff67c051f6ea99fd56dec735d9 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 1db33153c..3222a90d4 100644
index 5004d6f77..52e459002 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -138,6 +138,13 @@ public class PurpurWorldConfig {
@@ -137,6 +137,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 c0af3f0bdc521a6affe3abe78fbddb9fc671fe82 Mon Sep 17 00:00:00 2001
From 896752031746a5db598819c8ee826c8b53fe0759 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 3222a90d4..c87a75c3b 100644
index 52e459002..1bee83e61 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -138,6 +138,11 @@ public class PurpurWorldConfig {
@@ -137,6 +137,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 77545e54b58c06e4ff9e87f33a0bf03994beb4bc Mon Sep 17 00:00:00 2001
From d49265ee574818b3fce96fc7e53995e067a8792f 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 c87a75c3b..0593d2fe9 100644
index 1bee83e61..a98dd59b8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,11 @@ public class PurpurWorldConfig {
@@ -111,6 +111,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

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

@@ -1,4 +1,4 @@
From 7d4c2f44657a5d43208d8baa1c1ec7285d2cf692 Mon Sep 17 00:00:00 2001
From adcf39bd138599c2b8c804ff0d6df9a4127fc617 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
@@ -73,10 +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 0593d2fe9..012fa3f0a 100644
index a98dd59b8..9b6bd8f41 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -148,6 +148,14 @@ public class PurpurWorldConfig {
@@ -147,6 +147,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 0ffa3f16e5c3936857e8be70d81ed73d870b6454 Mon Sep 17 00:00:00 2001
From 0a138415bb88a6c54042d0b0fd22d3128cc4f4fc 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 012fa3f0a..744c0d681 100644
index 9b6bd8f41..06d9d9ed4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -107,6 +107,11 @@ public class PurpurWorldConfig {
@@ -106,6 +106,11 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

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

@@ -1,4 +1,4 @@
From 6a2ba2a58dbbd90bf3c44a97582cc7ecbcc1e10c Mon Sep 17 00:00:00 2001
From 28836c3c83dabf35398ee624855ceed85b0da776 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 e169fe9dc..7a751df29 100644
index b41d4959c..55e609cc1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,15 @@ public class PurpurWorldConfig {
@@ -111,6 +111,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 7b8cdc01951418afc0f0996d2efc8e04fef9ef17 Mon Sep 17 00:00:00 2001
From 05066d89da24a21e90810254164ca088a83bd12b 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 7a751df29..c467ae04c 100644
index 55e609cc1..3d78ac90c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -126,6 +126,11 @@ public class PurpurWorldConfig {
@@ -125,6 +125,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 55522cc3c848537a17f70100286fdbb1e90e9c06 Mon Sep 17 00:00:00 2001
From 411d2c65bb1595b452f13394693486442bb6f0d6 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 c467ae04c..61f7c496b 100644
index 3d78ac90c..12d2c8d10 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -172,6 +172,11 @@ public class PurpurWorldConfig {
@@ -171,6 +171,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 c55681440465593be020a42e78370c39c7b0f154 Mon Sep 17 00:00:00 2001
From 3b4921cca8a0bf57db90560da568919c0f9eb3a6 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 61f7c496b..4723fea9b 100644
index 12d2c8d10..a6b048873 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -192,6 +192,13 @@ public class PurpurWorldConfig {
@@ -191,6 +191,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 b685b2de99ca004330522d170ffb0a18da28770e Mon Sep 17 00:00:00 2001
From ceb530add28a5a0281affb36f744c08ed5358c97 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 4723fea9b..a9161814b 100644
index a6b048873..62b94bff3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -136,6 +136,11 @@ public class PurpurWorldConfig {
@@ -135,6 +135,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 6d5f21be17824297261e943840de770ea17ff8e5 Mon Sep 17 00:00:00 2001
From fee7b773978b346069eb7f6ed84a85deee0ab5a6 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 a9161814b..9796393fb 100644
index 62b94bff3..4f4996011 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -137,8 +137,10 @@ public class PurpurWorldConfig {
@@ -136,8 +136,10 @@ public class PurpurWorldConfig {
}
public boolean enderDragonAlwaysDropsEggBlock = false;

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

@@ -1,4 +1,4 @@
From 4309302d66bd9c1e929028443abf8df2767dfce2 Mon Sep 17 00:00:00 2001
From 1d831da5983de28f8b50e7df0cb8bf7c4d5ca3e3 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,10 +44,10 @@ 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 9796393fb..91ac7adca 100644
index 4f4996011..227436226 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 {
@@ -102,6 +102,11 @@ public class PurpurWorldConfig {
});
}

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

@@ -1,4 +1,4 @@
From 8ee67467a5ae731b0d7d632cb854f9804f313655 Mon Sep 17 00:00:00 2001
From 60a3d9ccbc6c7fae94d8ab9c3c4362d1d8c422b2 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,10 +96,10 @@ 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 91ac7adca..34767ac0d 100644
index 227436226..21a2c0c43 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,9 +103,12 @@ public class PurpurWorldConfig {
@@ -102,9 +102,12 @@ public class PurpurWorldConfig {
});
}

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

@@ -1,4 +1,4 @@
From 8dfd11977deee32abcea7d293beb9c64bb65127b Mon Sep 17 00:00:00 2001
From e53709efa9918c050ce58d74bc8fa6d3c9a37b02 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,10 +40,10 @@ 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 34767ac0d..602356152 100644
index 21a2c0c43..70e504ff3 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 {
@@ -102,6 +102,11 @@ public class PurpurWorldConfig {
});
}

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

@@ -1,4 +1,4 @@
From 29ae80a65d11ff503d1e0154ce377df2c5c866e5 Mon Sep 17 00:00:00 2001
From 2434efa14f3f761e4162e93704a900d3efaefc68 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 c4b5cbbe0..c912f72e1 100644
index 77e2dce3f..3e1e1d336 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -264,6 +264,11 @@ public class PurpurWorldConfig {
@@ -263,6 +263,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 ef459e450d108883f60a519ff6df3e70a994589c Mon Sep 17 00:00:00 2001
From 760b8ff3b7ac193c9afb783f2135f89c08599b18 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 3ad0cdbe3..17e4b9846 100644
index 61094d4f7..e6a1d88a2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,8 +184,10 @@ public class PurpurWorldConfig {
@@ -183,8 +183,10 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
}
@@ -57,7 +57,7 @@ index 3ad0cdbe3..17e4b9846 100644
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -196,6 +198,11 @@ public class PurpurWorldConfig {
@@ -195,6 +197,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 751f25e22a2c63e4ecd79d6f479421ffc1550725 Mon Sep 17 00:00:00 2001
From a44c7d5cc513398f71627117ebf48f10ef313555 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 387263c1b..b0e707ed0 100644
index 1a830b579..aa8398193 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -270,9 +270,11 @@ public class PurpurWorldConfig {
@@ -269,9 +269,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 25dd2eeccc89488ba9adc14af2be711dec1d9116 Mon Sep 17 00:00:00 2001
From 4441726b41ea1cf4ea99b60c4ccfa5d19192346a 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 b0e707ed0..2f93cfec4 100644
index aa8398193..26a760bc3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -271,10 +271,17 @@ public class PurpurWorldConfig {
@@ -270,10 +270,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 43278f27fd705ea20afdbf8d9ab86ba5edd386e1 Mon Sep 17 00:00:00 2001
From a4545096d19b58faaab92c66c6c1c76636f8712b 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 2f93cfec4..8d046b2f7 100644
index 26a760bc3..665eac22f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -270,17 +270,21 @@ public class PurpurWorldConfig {
@@ -269,17 +269,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 a45ddfa89be1d51030d6aa500dd52cabfee53d10 Mon Sep 17 00:00:00 2001
From 8248b744799addcefe0d79f65f93b90708321a49 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 8d046b2f7..54a7c5adc 100644
index 665eac22f..e3904be3f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -273,12 +273,16 @@ public class PurpurWorldConfig {
@@ -272,12 +272,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 0df56b1bffd237215c5c04ff43ee0786f6a5cf71 Mon Sep 17 00:00:00 2001
From e3522741cc2826ab18f1ef238131d117d24fa2c8 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 54a7c5adc..c5b8443fd 100644
index e3904be3f..de71f617d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -150,6 +150,11 @@ public class PurpurWorldConfig {
@@ -149,6 +149,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 9b535ba0b71df2b1a0302232a42dfdf24f4eeea8 Mon Sep 17 00:00:00 2001
From 1ecb5038187aea57699d76b56df6710ee947774f 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 c5b8443fd..077fdebfc 100644
index de71f617d..58b21bc81 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -151,8 +151,12 @@ public class PurpurWorldConfig {
@@ -150,8 +150,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 d22827d445a63d04e7dcd7921b9a426d1c14f61c Mon Sep 17 00:00:00 2001
From 5d90f058ef1435883c0c54a4d97332cfb6aa49e6 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 476cde529..9ad325300 100644
index a071129db..7da85ba5a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -317,6 +317,11 @@ public class PurpurWorldConfig {
@@ -316,6 +316,11 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
}

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

@@ -1,4 +1,4 @@
From 727ee03b5055295af7699619432ee812641d7a46 Mon Sep 17 00:00:00 2001
From 249401116e52f1e2a190192b38be512a6d71d087 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,10 +49,10 @@ 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 9ad325300..377b90f03 100644
index 7da85ba5a..f741218df 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -156,6 +156,11 @@ public class PurpurWorldConfig {
@@ -155,6 +155,11 @@ public class PurpurWorldConfig {
});
}

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

@@ -1,4 +1,4 @@
From 79216a9e6fdfec7a5670a029fa6424e0e4f832d2 Mon Sep 17 00:00:00 2001
From 68ce75bdc5411e92483f32f1b6c3a02dba4e5041 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,10 +67,10 @@ 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 7e872d8c8..3f60c5ed3 100644
index 993ad17ec..a9b1a130b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -160,6 +160,13 @@ public class PurpurWorldConfig {
@@ -159,6 +159,13 @@ public class PurpurWorldConfig {
});
}

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

@@ -1,4 +1,4 @@
From 9c2c18675a4fff5d6207475c0f02b6b0da715bf1 Mon Sep 17 00:00:00 2001
From f48aaf5a54ddeedc4009bd0349f896644e0422c3 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 b756a95e6..b2357435e 100644
index 9de724686..3e067c832 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -259,6 +259,15 @@ public class PurpurWorldConfig {
@@ -258,6 +258,15 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -221,7 +221,7 @@ index b756a95e6..b2357435e 100644
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
@@ -293,6 +302,15 @@ public class PurpurWorldConfig {
@@ -292,6 +301,15 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
}
@@ -237,7 +237,7 @@ index b756a95e6..b2357435e 100644
public double illusionerMaxHealth = 32.0D;
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
@@ -364,12 +382,36 @@ public class PurpurWorldConfig {
@@ -363,12 +381,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 14adb57a71187a7a3742fb3e73f0bb93387cb146 Mon Sep 17 00:00:00 2001
From e95d4c23dd09c9d68dbedcdd72de0c74320d9265 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 b2357435e..eb5c1d3fb 100644
index 3e067c832..f2ca515c9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -325,6 +325,15 @@ public class PurpurWorldConfig {
@@ -324,6 +324,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 661da9d236c52908b25b1872ff7a3d58ef6fe42c Mon Sep 17 00:00:00 2001
From 851c024121def856a1d8a096404a03684a761b30 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 eb5c1d3fb..5250d162f 100644
index f2ca515c9..e6b41ab92 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -270,9 +270,11 @@ public class PurpurWorldConfig {
@@ -269,9 +269,11 @@ public class PurpurWorldConfig {
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;