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

Fix ender dragon always drop egg block option

Browse Source
This commit is contained in:
William Blake Galbreath
2019-10-03 23:24:06 -05:00
parent bd4f9486b5
commit 5e3bb9c6e9
15 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0022-Always-place-dragon-egg-when-dragon-is-killed.patch
View File

@@ -1,12 +1,12 @@
From 157ff0d50b375dc16d6bf903f499541c5e692fc5 Mon Sep 17 00:00:00 2001
From ea578ab1879715652b4393dcac01053e3f5e634e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 1 Jun 2019 01:16:35 -0500
Subject: [PATCH] Always place dragon egg when dragon is killed
---
.../java/net/minecraft/server/EnderDragonBattle.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
.../net/minecraft/server/EnderDragonBattle.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 6700c8c65..c7470d285 100644
@@ -22,20 +22,22 @@ index 6700c8c65..c7470d285 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4c25d358f..b450ffc53 100644
index 4c25d358f..4baede017 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,17 @@ public class PurpurConfig {
@@ -142,6 +142,19 @@ public class PurpurConfig {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
}
+ public static boolean enderDragonAlwaysDropsEggBlock = false;
+ private static void enderDragonSettings() {
+ if (version < 2) {
+ boolean oldValue = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+ oldValue = config.getBoolean("settings.ender-dragon-death-always-places-egg-block", oldValue);
+
+ set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
+ if (config.isSet("ender-dragon-death-always-places-egg-block")) {
+ enderDragonAlwaysDropsEggBlock = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
+ if (config.isSet("settings.ender-dragon-death-always-places-egg-block")) {
+ enderDragonAlwaysDropsEggBlock = config.getBoolean("settings.ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
+ }
+ enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ }

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

@@ -1,4 +1,4 @@
From ca20da7aa930de137888d851158138ca4526f485 Mon Sep 17 00:00:00 2001
From ea4d6504bc39d430c6f154dfafa551ae288bc89b 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 2c34ab337..9bb033336 100644
this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b450ffc53..777f1a5fc 100644
index 4baede017..5dc882288 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -160,6 +160,11 @@ public class PurpurConfig {
@@ -162,6 +162,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
}

6
patches/server/0027-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 1e355ab5bd37cac3655c94264efa2d05aa0d7427 Mon Sep 17 00:00:00 2001
From b3b90ce062c93b15d90c9c550138bd78f68c3904 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -111,7 +111,7 @@ index ec96fa0a4..9ad3cc298 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 777f1a5fc..0e20e0b13 100644
index 5dc882288..db98b4c3f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,9 +1,13 @@
@@ -128,7 +128,7 @@ index 777f1a5fc..0e20e0b13 100644
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.event.inventory.InventoryType;
@@ -309,4 +313,30 @@ public class PurpurConfig {
@@ -311,4 +315,30 @@ public class PurpurConfig {
ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
}

6
patches/server/0029-Make-illusioners-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 65ea07c1250e22f8935b0f474126d0bf3e7d765c Mon Sep 17 00:00:00 2001
From 701e2a2dc2cb3606020f4cf416c6858b52872efd 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] Make illusioners naturally spawn
@@ -54,10 +54,10 @@ index 694075cb1..966ef81c6 100644
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 749dce0b4..d44b7b173 100644
index f9623c7c7..aa68cc366 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -169,6 +169,11 @@ public class PurpurConfig {
@@ -171,6 +171,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
}

6
patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch
View File

@@ -1,4 +1,4 @@
From 78d134d266a59ec0719c4dd9ab9e1ac199d4e1cd Mon Sep 17 00:00:00 2001
From c50b654b3f8a79aeb600ea02e31e1d8af4fddf08 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] Add chance for zombie horse natural spawns
@@ -38,10 +38,10 @@ index 7a0b657f2..c048db0d5 100644
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0e3a64e85..538ebb7fd 100644
index 882f7711c..f0ed3c974 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -205,6 +205,11 @@ public class PurpurConfig {
@@ -207,6 +207,11 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}

6
patches/server/0035-Fix-pig-zombies-MC-56653.patch
View File

@@ -1,4 +1,4 @@
From 731b54cf166d56b856ece3056ad504747b3813c7 Mon Sep 17 00:00:00 2001
From ba8da9b4384da86598467168816372d701a9ffcf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -43,10 +43,10 @@ index 5760a1836..54ccc93f1 100644
public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 538ebb7fd..4ce905aba 100644
index f0ed3c974..8a875a576 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -198,6 +198,11 @@ public class PurpurConfig {
@@ -200,6 +200,11 @@ public class PurpurConfig {
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
}

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

@@ -1,4 +1,4 @@
From db1134d18580098af96f8ac877101f8883bcdc4a Mon Sep 17 00:00:00 2001
From eacc9078b858179ba1d87f830e5c96a79b01f34d 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
@@ -77,10 +77,10 @@ index 987297634..eed256349 100644
public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4ce905aba..c4f1ab8f2 100644
index 8a875a576..ef00ce307 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -172,6 +172,11 @@ public class PurpurConfig {
@@ -174,6 +174,11 @@ public class PurpurConfig {
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
}

6
patches/server/0045-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From f210356f0372425ad10c0d1d19a7ae5dc0a8695f Mon Sep 17 00:00:00 2001
From 1718060fdd9467cd879dbda54222c84e81cea4a9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 08:28:21 -0500
Subject: [PATCH] Implement configurable villager brain ticks
@@ -40,10 +40,10 @@ index 830d93a85..d1d62a900 100644
this.world.getMethodProfiler().exit();
if (!this.dY() && this.bE > 0) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cdfd39374..ed2cdf509 100644
index 48d4f1f5a..44232346e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -230,6 +230,13 @@ public class PurpurConfig {
@@ -232,6 +232,13 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}

6
patches/server/0047-Add-option-to-disable-pillager-patrols.patch
View File

@@ -1,4 +1,4 @@
From 4d27b6984b51de8a6c2776fad0f52a40c9d4aa23 Mon Sep 17 00:00:00 2001
From 6e28e80f1cef96ad086dd0e56dce9359182d8619 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 27 Jul 2019 17:20:35 -0500
Subject: [PATCH] Add option to disable pillager patrols
@@ -21,10 +21,10 @@ index a9d32ebdf..b88040e03 100644
return 0;
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ed2cdf509..4243cd4d7 100644
index 44232346e..3e3bbb4c3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -223,6 +223,11 @@ public class PurpurConfig {
@@ -225,6 +225,11 @@ public class PurpurConfig {
pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
}

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

@@ -1,4 +1,4 @@
From 91134d37a715a37cfa1c78692ba0f3f094654a9f Mon Sep 17 00:00:00 2001
From 79736643c2309d5efd118a36a3506c2a8cfd0975 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 96676a786..b426941f5 100644
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.l();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 973cf6586..4f6df3ba6 100644
index f3e0df8f9..47bb0fb95 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -259,6 +259,11 @@ public class PurpurConfig {
@@ -261,6 +261,11 @@ public class PurpurConfig {
villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
}

6
patches/server/0056-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From 2dc580a511b3496138c19e6ba1eae6700c102f8d Mon Sep 17 00:00:00 2001
From 6b3959cb0a2d244edd7ed730e56b3b5a26fdefaa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
@@ -56,10 +56,10 @@ index fd54958f6..3ee8332c9 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4f6df3ba6..ab17fc26f 100644
index 47bb0fb95..1d043e53a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -281,6 +281,19 @@ public class PurpurConfig {
@@ -283,6 +283,19 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}

10
patches/server/0057-Ender-Dragon-always-drops-full-exp.patch
View File

@@ -1,4 +1,4 @@
From 677d5921a07b7d736b0b335cad965c5f7ef309f6 Mon Sep 17 00:00:00 2001
From 81482a75f9d7503a38261cb283594bc3f8e6e6cd 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 drops full exp
@@ -22,7 +22,7 @@ index 6a6367a2e..578676fec 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 14930aea7..46c31ad1c 100644
index 1d043e53a..bc8ad4a7c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,6 +194,7 @@ public class PurpurConfig {
@@ -32,9 +32,9 @@ index 14930aea7..46c31ad1c 100644
+ public static boolean enderDragonAlwaysDropsFullExp = false;
private static void enderDragonSettings() {
if (version < 2) {
boolean oldValue = config.getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
@@ -202,6 +203,7 @@ public class PurpurConfig {
set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
if (config.isSet("ender-dragon-death-always-places-egg-block")) {
@@ -204,6 +205,7 @@ public class PurpurConfig {
}
}
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ enderDragonAlwaysDropsFullExp = getBoolean("settings.mobs.ender-dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);

6
patches/server/0060-Add-killer-rabbit-natural-spawn-chance.patch
View File

@@ -1,4 +1,4 @@
From 31a6fc0ab24d9bf15a8fb32cf890d85e67e5e960 Mon Sep 17 00:00:00 2001
From b9d0c3d5fcad5d6eb857309e3083751df28c32f7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 31 Aug 2019 17:24:41 -0500
Subject: [PATCH] Add killer rabbit natural spawn chance
@@ -22,10 +22,10 @@ index d48610df3..498c453d7 100644
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 46c31ad1c..d03b96bcc 100644
index bc8ad4a7c..1a1cee00d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -247,6 +247,11 @@ public class PurpurConfig {
@@ -249,6 +249,11 @@ public class PurpurConfig {
disablePillagerPatrols = getBoolean("settings.mobs.pillager.disable-patrols", disablePillagerPatrols);
}

6
patches/server/0061-Add-option-to-spawn-Toast.patch
View File

@@ -1,4 +1,4 @@
From 2d0870d724ac31c6cee1b48429f036a548d40fcb Mon Sep 17 00:00:00 2001
From abe8c126fd25b489ae78b0f4bbc864cf33763d7a 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] Add option to spawn Toast
@@ -30,10 +30,10 @@ index 498c453d7..41d8d1ccb 100644
BiomeBase biomebase = generatoraccess.getBiome(new BlockPosition(this));
int i = this.random.nextInt(100);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d03b96bcc..644ad14b3 100644
index 1a1cee00d..0481db6f1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -248,8 +248,10 @@ public class PurpurConfig {
@@ -250,8 +250,10 @@ public class PurpurConfig {
}
public static double killerRabbitChance = 0.0D;

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

@@ -1,4 +1,4 @@
From 69ada1740794b540e8bfa8291af911927d83e298 Mon Sep 17 00:00:00 2001
From febebfb0e03e59cdea3b1c20073a04aa927e5d1d 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
@@ -38,10 +38,10 @@ index d1d62a900..2a848304d 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e08f307c7..c31d8d23a 100644
index 0481db6f1..04a58a8da 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -263,9 +263,11 @@ public class PurpurConfig {
@@ -265,9 +265,11 @@ public class PurpurConfig {
public static boolean useVillagerBrainTicksOnlyWhenLagging = true;
public static int villagerBrainTicks = 20;