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

Ender Dragon always drops full exp

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-24 15:07:35 -05:00
parent 90bc8df7a1
commit ddccf60703
14 changed files with 122 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/source/configuration.rst
View File

@@ -128,9 +128,12 @@ mobs
- **description**: Number of mushrooms to feed a cow to make it transform into a mooshroom. Value of 0 disables feature.
* ender-dragon
* death-always-places-egg-block
- **default**: true
* always-drop-egg-block
- **default**: false
- **description:** When true all valid ender dragon deaths will place an ender egg block on top of the portal
* always-drop-full-exp
- **default**: false
- **description:** When true all valid ender dragon deaths will drop the full amount of experience orbs as if it were the first dragon death
* fox
* tulips-change-type

6
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 3e64ca86030b5538037add9d226ae61e05c1c53d Mon Sep 17 00:00:00 2001
From 00cd866c5963485df448662ed01804b3e70ab52b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
@@ -755,7 +755,7 @@ index 000000000..f8cf4ad23
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 000000000..b0f0040a4
index 000000000..6f378b5f6
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,133 @@
@@ -779,7 +779,7 @@ index 000000000..b0f0040a4
+import java.util.logging.Level;
+
+public class PurpurConfig {
+ private static final int CONFIG_VERSION = 1;
+ private static final int CONFIG_VERSION = 2;
+ private static final String HEADER = "This is the main configuration file for Purpur.\n"
+ + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n"
+ + "with caution, and make sure you know what each option does before configuring.\n"

44
patches/server/0023-Always-place-dragon-egg-when-dragon-is-killed.patch
View File

@@ -1,15 +1,15 @@
From 6cb81e2b5db9fdc1f29f2a71d4ad27ed2b268657 Mon Sep 17 00:00:00 2001
From cf4910c1723f54cdd5f195294ef83f7950eb16f2 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
---
src/main/java/net/minecraft/server/EnderDragonBattle.java | 4 +++-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
.../minecraft/server/EnderDragonBattle.java | 4 +++-
.../java/net/pl3x/purpur/PurpurConfig.java | 19 +++++++++++++++++++
2 files changed, 22 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..f0c77eb6c 100644
index 6700c8c65..8dab537e9 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -13,6 +13,8 @@ import java.util.Set;
@@ -26,26 +26,40 @@ index 6700c8c65..f0c77eb6c 100644
this.a(true);
this.n();
- if (!this.l) {
+ if (PurpurConfig.enderDragonDeathAlwaysPlacesEggBlock || !this.l) { // Purpur - always place dragon egg
+ if (PurpurConfig.enderDragonAlwaysDropsEggBlock || !this.l) { // Purpur - always place dragon egg
this.d.setTypeUpdate(this.d.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING, WorldGenEndTrophy.a), Blocks.DRAGON_EGG.getBlockData());
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index abc43c4e3..4fbf12b9f 100644
index 4c25d358f..16fb9478a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -177,6 +177,11 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
@@ -142,6 +142,25 @@ public class PurpurConfig {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
}
+ public static boolean enderDragonDeathAlwaysPlacesEggBlock = true;
+ private static void enderDragonDeathAlwaysPlacesEggBlock() {
+ enderDragonDeathAlwaysPlacesEggBlock = getBoolean("settings.ender-dragon-death-always-places-egg-block", enderDragonDeathAlwaysPlacesEggBlock);
+ public static boolean enderDragonAlwaysDropsEggBlock = false;
+ private static void enderDragonSettings() {
+ if (version < 2) {
+ boolean oldValue = getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
+ oldValue = getBoolean("settings.ender-dragon-death-always-places-egg-block", oldValue);
+
+ set("ender-dragon-death-always-places-egg-block", null);
+ set("settings.ender-dragon-death-always-places-egg-block", null);
+
+ set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
+ }
+ enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ }
+
public static boolean ridableBat = true;
public static boolean ridableBlaze = true;
public static boolean ridableCat = true;
+ public static boolean tulipsChangeFoxType = true;
+ private static void foxSettings() {
+ tulipsChangeFoxType = getBoolean("settings.mobs.fox.tulips-change-type", tulipsChangeFoxType);
+ }
+
public static boolean giantsNaturallySpawn = true;
public static boolean giantsHaveAI = true;
private static void giantsSettings() {
--
2.23.0.rc1

8
patches/server/0026-Make-Iron-Golems-Swim.patch
View File

@@ -1,4 +1,4 @@
From dec24ceb3639ca2108236f7271d7c2a7ca05f3df Mon Sep 17 00:00:00 2001
From 9d56f2f8acd6a601abd773cd803cb8227a5ea2e8 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 346646594..ddeb15b5d 100644
index 16fb9478a..1c63724c4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig {
@@ -168,6 +168,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
}
@@ -37,5 +37,5 @@ index 346646594..ddeb15b5d 100644
public static float crystalsAttackPhantomDamage = 1.0F;
public static double phantomsOrbitCrystalsRadius = 0.0D;
--
2.20.1
2.23.0.rc1

8
patches/server/0028-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 352fae6cf150c9a56028d01077eb87a78d61b85a Mon Sep 17 00:00:00 2001
From f48a623d39ee69754756d20656d4a954011d50ac 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 ddeb15b5d..40b28ebe5 100644
index 1c63724c4..f5dcdda6c 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 ddeb15b5d..40b28ebe5 100644
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.event.inventory.InventoryType;
@@ -303,4 +307,30 @@ public class PurpurConfig {
@@ -317,4 +321,30 @@ public class PurpurConfig {
ridableZombiePigman = getBoolean("settings.ridable.zombie_pigman", ridableZombiePigman);
ridableZombieVillager = getBoolean("settings.ridable.zombie_villager", ridableZombieVillager);
}
@@ -160,5 +160,5 @@ index ddeb15b5d..40b28ebe5 100644
+ }
}
--
2.20.1
2.23.0.rc1

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

@@ -1,4 +1,4 @@
From db58cdb29dadd76ea00bbc89d7af6236ac985874 Mon Sep 17 00:00:00 2001
From bc945b320b5dd3c71df603969f0ed00c8e81e581 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 412a120e2..76556e7ea 100644
index 24c0e86eb..9b96ee52c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -158,6 +158,11 @@ public class PurpurConfig {
@@ -177,6 +177,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
}

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

@@ -1,4 +1,4 @@
From d8364e2ffae55ab7981db722fffa74d00fd27122 Mon Sep 17 00:00:00 2001
From cd4dc13e8fffc6724060aa215d56649459f0e72a 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 163d4fa85..f996c2c24 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 e515f4775..c7e634ecc 100644
index 75104cee6..d09aadb01 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,6 +194,11 @@ public class PurpurConfig {
@@ -213,6 +213,11 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}

8
patches/server/0037-Fix-pig-zombies-MC-56653.patch
View File

@@ -1,4 +1,4 @@
From d7ce83d1ba4d9bd72c224c519bf9b86483389fc1 Mon Sep 17 00:00:00 2001
From eb22727e3d1c2598a5c8a5ae405a033c9937b2d9 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 c7e634ecc..e3362c4dd 100644
index d09aadb01..b0f5c3db3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -187,6 +187,11 @@ public class PurpurConfig {
@@ -206,6 +206,11 @@ public class PurpurConfig {
phantomsOrbitCrystalsRadius = getDouble("settings.mobs.phantom.orbit-crystal-radius", phantomsOrbitCrystalsRadius);
}
@@ -59,5 +59,5 @@ index c7e634ecc..e3362c4dd 100644
public static boolean snowmanPumpkinPutBack = false;
private static void snowmansSettings() {
--
2.20.1
2.23.0.rc1

25
patches/server/0040-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From e9a644959a7be08f14290bdbbbc9c5daf53fd2c8 Mon Sep 17 00:00:00 2001
From 714752c1c6b7745937c85881108589ba4b72a161 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
@@ -6,11 +6,10 @@ Subject: [PATCH] Tulips change fox type
---
.../java/net/minecraft/server/EntityFox.java | 27 +++++++++++++++++++
src/main/java/net/minecraft/server/Items.java | 4 +--
.../java/net/pl3x/purpur/PurpurConfig.java | 5 ++++
3 files changed, 34 insertions(+), 2 deletions(-)
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 27b29f633..834fbbe13 100644
index e9f6b3931..07891a055 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -232,6 +232,11 @@ public class EntityFox extends EntityAnimal {
@@ -76,22 +75,6 @@ index 987297634..eed256349 100644
public static final Item bc = a(Blocks.PINK_TULIP, CreativeModeTab.c);
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 c7e634ecc..c4afafc59 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -161,6 +161,11 @@ public class PurpurConfig {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
}
+ public static boolean tulipsChangeFoxType = true;
+ private static void foxSettings() {
+ tulipsChangeFoxType = getBoolean("settings.mobs.fox.tulips-change-type", tulipsChangeFoxType);
+ }
+
public static boolean giantsNaturallySpawn = true;
public static boolean giantsHaveAI = true;
private static void giantsSettings() {
--
2.20.1
2.23.0.rc1

10
patches/server/0047-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From c58aa474b6071749ee9d4136d89d8f6cae5f796e Mon Sep 17 00:00:00 2001
From 043cff4c73d4c0da58cbaaacbd87264dc245b086 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
2 files changed, 13 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 70e8a422..da3fb4b5 100644
index 70e8a422a..da3fb4b57 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -40,10 +40,10 @@ index 70e8a422..da3fb4b5 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 d48f9371..a676746d 100644
index 1c4e6ec06..24db73807 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -219,6 +219,13 @@ public class PurpurConfig {
@@ -233,6 +233,13 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}
@@ -58,5 +58,5 @@ index d48f9371..a676746d 100644
private static void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
--
2.20.1
2.23.0.rc1

10
patches/server/0049-Add-option-to-disable-pillager-patrols.patch
View File

@@ -1,4 +1,4 @@
From 584f4f7caa9c9482035da97da63ccd6a575508dc Mon Sep 17 00:00:00 2001
From 3477e1051bc8669ed64f25f102f604cf0fa33c75 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to disable pillager patrols
2 files changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
index bb612b38..99bb38f0 100644
index bb612b386..99bb38f03 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java
@@ -9,6 +9,7 @@ public class MobSpawnerPatrol {
@@ -21,10 +21,10 @@ index bb612b38..99bb38f0 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 a676746d..01c9d086 100644
index 24db73807..16e7c1aed 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -212,6 +212,11 @@ public class PurpurConfig {
@@ -226,6 +226,11 @@ public class PurpurConfig {
pigmenDontTargetUnlessHit = getBoolean("settings.mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
}
@@ -37,5 +37,5 @@ index a676746d..01c9d086 100644
public static boolean snowmanPumpkinPutBack = false;
private static void snowmansSettings() {
--
2.20.1
2.23.0.rc1

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

@@ -1,4 +1,4 @@
From 966cdfa706801619c2a4849a6fe9fc91111b350c Mon Sep 17 00:00:00 2001
From ba75df9df7be44b80bb5c590c9e3e3e12c8c44cb 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 ee83df5cc..0022211be 100644
index 9dca0fce2..9532bf349 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -248,6 +248,11 @@ public class PurpurConfig {
@@ -262,6 +262,11 @@ public class PurpurConfig {
villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
}

8
patches/server/0058-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From 8ea6f7d2290cdb598399443c849f39385c601a07 Mon Sep 17 00:00:00 2001
From 85bef7b02eb3f2ee7239564473acf22a45bebec8 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
@@ -23,11 +23,11 @@ index fd54958f6..1d3ab9703 100644
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e8aba4ec9..d96adabe2 100644
index 9532bf349..0d1ee157b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -275,6 +275,11 @@ public class PurpurConfig {
enderDragonDeathAlwaysPlacesEggBlock = getBoolean("settings.ender-dragon-death-always-places-egg-block", enderDragonDeathAlwaysPlacesEggBlock);
@@ -284,6 +284,11 @@ public class PurpurConfig {
InventoryType.BARREL.setDefaultSize(packedBarrels ? 54 : 27);
}
+ public static boolean slimesNotPushable = false;

46
patches/server/0059-Ender-Dragon-always-drops-full-exp.patch Normal file
View File

@@ -0,0 +1,46 @@
From 059b482a5264839ee16e36b76c1ef067a263b722 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
---
src/main/java/net/minecraft/server/EntityEnderDragon.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index 6a6367a2e..578676fec 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -558,7 +558,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
boolean flag = this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT);
short short0 = 500;
- if (this.bP != null && !this.bP.d()) {
+ if (net.pl3x.purpur.PurpurConfig.enderDragonAlwaysDropsFullExp || (this.bP != null && !this.bP.d())) { // Purpur
short0 = 12000;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0d1ee157b..d85f3daa7 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 {
}
public static boolean enderDragonAlwaysDropsEggBlock = false;
+ public static boolean enderDragonAlwaysDropsFullExp = false;
private static void enderDragonSettings() {
if (version < 2) {
boolean oldValue = getBoolean("ender-dragon-death-always-places-egg-block", enderDragonAlwaysDropsEggBlock);
@@ -205,6 +206,7 @@ public class PurpurConfig {
set("settings.mobs.ender-dragon.always-drop-egg-block", oldValue);
}
enderDragonAlwaysDropsEggBlock = getBoolean("settings.mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ enderDragonAlwaysDropsFullExp = getBoolean("settings.mobs.ender-dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
}
public static boolean tulipsChangeFoxType = true;
--
2.23.0.rc1