Fix last commit :3

This commit is contained in:
William Blake Galbreath
2020-07-01 20:52:58 -05:00
parent 0a94563749
commit 3b4e44ff44
36 changed files with 133 additions and 129 deletions

View File

@@ -1,4 +1,4 @@
From a4e1b9d46aea64612ae6df1aa6e8e4f8e63962f6 Mon Sep 17 00:00:00 2001 From a3d3e58ef40bbd5ccd54c189cd411a952c752593 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500 Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files Subject: [PATCH] Purpur config files
@@ -220,7 +220,7 @@ index 000000000..333c880bf
+} +}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
new file mode 100644 new file mode 100644
index 000000000..8c4b5f514 index 000000000..361f7857e
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@@ -273,7 +273,7 @@ index 000000000..8c4b5f514
+ return PurpurConfig.config.getInt("world-settings." + worldName + "." + path, PurpurConfig.config.getInt("world-settings.default." + path)); + return PurpurConfig.config.getInt("world-settings." + worldName + "." + path, PurpurConfig.config.getInt("world-settings.default." + path));
+ } + }
+ +
+ private <T> List getList(String path, T def) { + private <T> List<?> getList(String path, T def) {
+ PurpurConfig.config.addDefault("world-settings.default." + path, def); + PurpurConfig.config.addDefault("world-settings.default." + path, def);
+ return PurpurConfig.config.getList("world-settings." + worldName + "." + path, PurpurConfig.config.getList("world-settings.default." + path)); + return PurpurConfig.config.getList("world-settings." + worldName + "." + path, PurpurConfig.config.getList("world-settings.default." + path));
+ } + }

View File

@@ -1,4 +1,4 @@
From 6ac97172d3fcd533dec614e4f4de61e4443d9cc0 Mon Sep 17 00:00:00 2001 From c3c4a34f5faa408e46a5ace127d5574ade5aee80 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500 Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners Subject: [PATCH] Silk touch spawners
@@ -8,8 +8,8 @@ Subject: [PATCH] Silk touch spawners
.../net/minecraft/server/BlockMobSpawner.java | 35 +++++++++++++++++++ .../net/minecraft/server/BlockMobSpawner.java | 35 +++++++++++++++++++
.../net/minecraft/server/ItemSpawner.java | 23 ++++++++++++ .../net/minecraft/server/ItemSpawner.java | 23 ++++++++++++
src/main/java/net/minecraft/server/Items.java | 2 +- src/main/java/net/minecraft/server/Items.java | 2 +-
.../net/pl3x/purpur/PurpurWorldConfig.java | 21 +++++++++++ .../net/pl3x/purpur/PurpurWorldConfig.java | 23 ++++++++++++
5 files changed, 81 insertions(+), 1 deletion(-) 5 files changed, 83 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java 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 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 cy = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item cz = a(Blocks.DIAMOND_ORE, CreativeModeTab.b); 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 644501d5e..6ddd3442f 100644 index c7fb5a737..bb107a457 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
@@ -136,21 +136,23 @@ index 644501d5e..6ddd3442f 100644
import java.util.List; import java.util.List;
import static net.pl3x.purpur.PurpurConfig.log; import static net.pl3x.purpur.PurpurConfig.log;
@@ -75,6 +81,21 @@ public class PurpurWorldConfig { @@ -75,6 +81,23 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack); playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
} }
+ public boolean silkTouchEnabled = false; + public boolean silkTouchEnabled = false;
+ public List<Item> silkTouchTools = new ArrayList<Item>(){{ + public List<Item> silkTouchTools = new ArrayList<>();
+ add(Items.IRON_PICKAXE);
+ add(Items.GOLDEN_PICKAXE);
+ add(Items.DIAMOND_PICKAXE);
+ add(Items.NETHERITE_PICKAXE);
+ }};
+ private void silkTouchSettings() { + private void silkTouchSettings() {
+ silkTouchEnabled = getBoolean("gameplay-mechanics.silk-touch.enabled", silkTouchEnabled); + silkTouchEnabled = getBoolean("gameplay-mechanics.silk-touch.enabled", silkTouchEnabled);
+ getList("gameplay-mechanics.silk-touch.tools", silkTouchTools).forEach(key -> { + silkTouchTools.clear();
+ Item item = IRegistry.ITEM.get(new MinecraftKey((String) key)); + getList("gameplay-mechanics.silk-touch.tools", new ArrayList<String>(){{
+ add("minecraft:iron_pickaxe");
+ add("minecraft:golden_pickaxe");
+ 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); + if (item != Items.AIR) silkTouchTools.add(item);
+ }); + });
+ } + }

View File

@@ -1,4 +1,4 @@
From 3c49db7083cfbf60e190d0b5d5a81032ab0172c0 Mon Sep 17 00:00:00 2001 From 34055397fa238b1b4689d0abbd24c0a857b2b957 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500 Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] MC-168772 Fix - Add turtle egg block options 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6ddd3442f..9c006a2bd 100644 index bb107a457..9b6c53db0 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,6 +96,15 @@ public class PurpurWorldConfig { @@ -98,6 +98,15 @@ public class PurpurWorldConfig {
}); });
} }

View File

@@ -1,4 +1,4 @@
From 7a13ed668c6e0c4ce443caeae5d2fa9c6db0a1a9 Mon Sep 17 00:00:00 2001 From c2fca687c9e90251444001c3c1804f9e3f4c0640 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500 Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Giants AI settings 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c006a2bd..68ebb723b 100644 index 9b6c53db0..1efd334b8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -105,6 +105,23 @@ public class PurpurWorldConfig { @@ -107,6 +107,23 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
From 143de3af8f18ae724f2224f91536a67e59c044d5 Mon Sep 17 00:00:00 2001 From 77545e54b58c06e4ff9e87f33a0bf03994beb4bc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 15:56:22 -0500 Date: Sat, 13 Jul 2019 15:56:22 -0500
Subject: [PATCH] Tulips change fox type 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 bq = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item br = a(Blocks.CORNFLOWER, 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2e75644c7..2c2d1229d 100644 index c87a75c3b..0593d2fe9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,6 +110,11 @@ public class PurpurWorldConfig { @@ -112,6 +112,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
} }

View File

@@ -1,4 +1,4 @@
From 105de6d97b00aefab67fede0ec61daa641a844d6 Mon Sep 17 00:00:00 2001 From 7d4c2f44657a5d43208d8baa1c1ec7285d2cf692 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:46:44 -0500 Date: Thu, 26 Mar 2020 19:46:44 -0500
Subject: [PATCH] Breedable Polar Bears Subject: [PATCH] Breedable Polar Bears
@@ -73,10 +73,10 @@ index 69e5c1aed..6506e0055 100644
this.datawatcher.set(EntityPolarBear.bv, flag); 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2c2d1229d..69bf1302d 100644 index 0593d2fe9..012fa3f0a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -146,6 +146,14 @@ public class PurpurWorldConfig { @@ -148,6 +148,14 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim); ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
} }

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
From d5ab920d3240d88395e81eb9cbc0db42f0734ef8 Mon Sep 17 00:00:00 2001 From 55522cc3c848537a17f70100286fdbb1e90e9c06 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 01:14:46 -0500 Date: Sun, 12 May 2019 01:14:46 -0500
Subject: [PATCH] Pigs give saddle back 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0b79a7876..b799ea018 100644 index c467ae04c..61f7c496b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -170,6 +170,11 @@ public class PurpurWorldConfig { @@ -172,6 +172,11 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim); ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
} }

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
From 694d49f088255ea5f912cf7d901ce5a2bc147a50 Mon Sep 17 00:00:00 2001 From 6d5f21be17824297261e943840de770ea17ff8e5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 24 Aug 2019 14:42:54 -0500 Date: Sat, 24 Aug 2019 14:42:54 -0500
Subject: [PATCH] Ender dragon always drop full exp 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 35d8e0c59..b04159eb0 100644 index a9161814b..9796393fb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -135,8 +135,10 @@ public class PurpurWorldConfig { @@ -137,8 +137,10 @@ public class PurpurWorldConfig {
} }
public boolean enderDragonAlwaysDropsEggBlock = false; public boolean enderDragonAlwaysDropsEggBlock = false;

View File

@@ -1,4 +1,4 @@
From f4504a3c1ef5906cb9fb96ef405923172bb900be Mon Sep 17 00:00:00 2001 From 4309302d66bd9c1e929028443abf8df2767dfce2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 24 May 2019 02:39:25 -0500 Date: Fri, 24 May 2019 02:39:25 -0500
Subject: [PATCH] Signs editable on right click Subject: [PATCH] Signs editable on right click
@@ -44,10 +44,10 @@ index c4b0d8720..e1ab29975 100644
// Paper start // Paper start
//this.c = entityhuman; //this.c = entityhuman;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b04159eb0..8e735db2d 100644 index 9796393fb..91ac7adca 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,11 @@ public class PurpurWorldConfig { @@ -103,6 +103,11 @@ public class PurpurWorldConfig {
}); });
} }

View File

@@ -1,4 +1,4 @@
From b7422f08be8c2954b4bee7633637dc052094725f Mon Sep 17 00:00:00 2001 From 8ee67467a5ae731b0d7d632cb854f9804f313655 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500 Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes Subject: [PATCH] Signs allow color codes
@@ -96,10 +96,10 @@ index e1ab29975..1778c5474 100644
@Override @Override
public PacketPlayOutTileEntityData getUpdatePacket() { public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8e735db2d..89c1ed77f 100644 index 91ac7adca..34767ac0d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,9 +101,12 @@ public class PurpurWorldConfig { @@ -103,9 +103,12 @@ public class PurpurWorldConfig {
}); });
} }

View File

@@ -1,4 +1,4 @@
From b886b0ac06829ede73a6a01842a3e23e7415f399 Mon Sep 17 00:00:00 2001 From 8dfd11977deee32abcea7d293beb9c64bb65127b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 21 Jun 2019 14:37:10 -0500 Date: Fri, 21 Jun 2019 14:37:10 -0500
Subject: [PATCH] Allow soil to moisten from water directly under it Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -40,10 +40,10 @@ index a315e2628..8dd48669c 100644
@Override @Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 89c1ed77f..e0dbeaf06 100644 index 34767ac0d..602356152 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,11 @@ public class PurpurWorldConfig { @@ -103,6 +103,11 @@ public class PurpurWorldConfig {
}); });
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
From 25d58af919ad793570e61f80f039975083b9e497 Mon Sep 17 00:00:00 2001 From a45ddfa89be1d51030d6aa500dd52cabfee53d10 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500 Date: Mon, 22 Jul 2019 17:32:17 -0500
Subject: [PATCH] Implement configurable search radius for villagers to spawn 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) { 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5d9402127..200564fef 100644 index 8d046b2f7..54a7c5adc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -271,12 +271,16 @@ public class PurpurWorldConfig { @@ -273,12 +273,16 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false; public boolean villagerCanBeLeashed = false;
public boolean villagerFarmingBypassMobGriefing = false; public boolean villagerFarmingBypassMobGriefing = false;
public boolean villagerFollowEmeraldBlock = false; public boolean villagerFollowEmeraldBlock = false;

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
From c54fa12c59963f837667f98adb92d9a90397da37 Mon Sep 17 00:00:00 2001 From d22827d445a63d04e7dcd7921b9a426d1c14f61c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 17 Aug 2019 15:27:09 -0500 Date: Sat, 17 Aug 2019 15:27:09 -0500
Subject: [PATCH] Add option for zombies targetting turtle eggs 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.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.m(); this.m();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 00b6f6317..51984a527 100644 index 476cde529..9ad325300 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -315,6 +315,11 @@ public class PurpurWorldConfig { @@ -317,6 +317,11 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage); witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
} }

View File

@@ -1,4 +1,4 @@
From d647c38d2b80c777f069a8439b088bc1200ed450 Mon Sep 17 00:00:00 2001 From 727ee03b5055295af7699619432ee812641d7a46 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 25 Aug 2019 00:09:52 -0500 Date: Sun, 25 Aug 2019 00:09:52 -0500
Subject: [PATCH] Dispenser curse of binding protection Subject: [PATCH] Dispenser curse of binding protection
@@ -49,10 +49,10 @@ index 885458d54..c7d67d729 100644
return this.b; return this.b;
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 51984a527..861034f29 100644 index 9ad325300..377b90f03 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -154,6 +154,11 @@ public class PurpurWorldConfig { @@ -156,6 +156,11 @@ public class PurpurWorldConfig {
}); });
} }

View File

@@ -1,4 +1,4 @@
From 141e162655aff17493f74e0e582e8c7b7a551978 Mon Sep 17 00:00:00 2001 From 79216a9e6fdfec7a5670a029fa6424e0e4f832d2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 20:57:29 -0500 Date: Fri, 23 Aug 2019 20:57:29 -0500
Subject: [PATCH] Implement bamboo growth settings 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 28693ffa6..b436e5ec1 100644 index 7e872d8c8..3f60c5ed3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -158,6 +158,13 @@ public class PurpurWorldConfig { @@ -160,6 +160,13 @@ public class PurpurWorldConfig {
}); });
} }

View File

@@ -1,13 +1,13 @@
From 53ba13952b4beee3685e0b029c404df59310b974 Mon Sep 17 00:00:00 2001 From a156ba8ddc37e18eab14d265cacf4940c596cfa6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Feb 2020 15:54:08 -0600 Date: Sat, 22 Feb 2020 15:54:08 -0600
Subject: [PATCH] Add item entity options Subject: [PATCH] Add item entity options
--- ---
src/main/java/net/minecraft/server/Entity.java | 1 + src/main/java/net/minecraft/server/Entity.java | 1 +
src/main/java/net/minecraft/server/EntityItem.java | 4 +++- .../java/net/minecraft/server/EntityItem.java | 4 +++-
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++++++++ .../java/net/pl3x/purpur/PurpurWorldConfig.java | 15 +++++++++++++++
3 files changed, 17 insertions(+), 1 deletion(-) 3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7a4cc7c30..476ca65a4 100644 index 7a4cc7c30..476ca65a4 100644
@@ -44,22 +44,24 @@ index a7860cb4d..77e970c30 100644
// CraftBukkit start // CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { 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 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index edfb64bc5..7c8735e52 100644 index 19e87de9f..b756a95e6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -99,6 +99,19 @@ public class PurpurWorldConfig { @@ -99,6 +99,21 @@ public class PurpurWorldConfig {
} }
} }
+ public List<Item> itemImmuneToExplosion = new ArrayList<>(); + public List<Item> itemImmuneToExplosion = new ArrayList<>();
+ public List<Item> itemImmuneToFire = new ArrayList<>(); + public List<Item> itemImmuneToFire = new ArrayList<>();
+ private void itemSettings() { + private void itemSettings() {
+ getList("gameplay-mechanics.item.immune.explosion", itemImmuneToExplosion).forEach(key -> { + itemImmuneToExplosion.clear();
+ Item item = IRegistry.ITEM.get(new MinecraftKey((String) key)); + getList("gameplay-mechanics.item.immune.explosion", new ArrayList<>()).forEach(key -> {
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToExplosion.add(item); + if (item != Items.AIR) itemImmuneToExplosion.add(item);
+ }); + });
+ getList("gameplay-mechanics.item.immune.fire", itemImmuneToFire).forEach(key -> { + itemImmuneToFire.clear();
+ Item item = IRegistry.ITEM.get(new MinecraftKey((String) key)); + getList("gameplay-mechanics.item.immune.fire", new ArrayList<>()).forEach(key -> {
+ Item item = IRegistry.ITEM.get(new MinecraftKey(key.toString()));
+ if (item != Items.AIR) itemImmuneToFire.add(item); + if (item != Items.AIR) itemImmuneToFire.add(item);
+ }); + });
+ } + }

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
From 1adc1134e6baf7af66f11ba599897a90596076e4 Mon Sep 17 00:00:00 2001 From 661da9d236c52908b25b1872ff7a3d58ef6fe42c Mon Sep 17 00:00:00 2001
From: Jason Bierque <bierquejason@gmail.com> From: Jason Bierque <bierquejason@gmail.com>
Date: Wed, 1 Jul 2020 22:36:06 +0200 Date: Wed, 1 Jul 2020 22:36:06 +0200
Subject: [PATCH] Customizable EnderDragon Health Subject: [PATCH] Customizable EnderDragon Health
@@ -30,10 +30,10 @@ index 08fa5a975..e08e6014f 100644
protected void initDatawatcher() { protected void initDatawatcher() {
super.initDatawatcher(); super.initDatawatcher();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 40aabda0b..c215985e6 100644 index eb5c1d3fb..5250d162f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -266,9 +266,11 @@ public class PurpurWorldConfig { @@ -270,9 +270,11 @@ public class PurpurWorldConfig {
public boolean enderDragonAlwaysDropsEggBlock = false; public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false; public boolean enderDragonAlwaysDropsFullExp = false;