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

Move more options to per-world section (still more to come)

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-14 19:33:01 -06:00
parent bee0cc833b
commit a221240eef
35 changed files with 298 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
patches/server/0055-Ender-Dragon-always-drops-full-exp.patch
View File

@@ -1,15 +1,15 @@
From abf73c2baed8515f9e2d6d9664b859685c42ffed Mon Sep 17 00:00:00 2001
From 000015edf660a1af0c6c7bd66e0b6de9b9870672 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 ++
src/main/java/net/pl3x/purpur/PurpurWorldConfig.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 5935ecb529..c7db47ae93 100644
index 5935ecb529..19395a9349 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -567,7 +567,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -17,30 +17,25 @@ index 5935ecb529..c7db47ae93 100644
short short0 = 500;
- if (this.bN != null && !this.bN.d()) {
+ if (net.pl3x.purpur.PurpurConfig.enderDragonAlwaysDropsFullExp || (this.bN != null && !this.bN.d())) { // Purpur
+ if (world.purpurConfig.enderDragonAlwaysDropsFullExp || (this.bN != null && !this.bN.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 94ca1e0bcb..26ac853132 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 {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e4de91a658..e8f1db88f1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -156,8 +156,10 @@ public class PurpurWorldConfig {
}
public static boolean enderDragonAlwaysDropsEggBlock = false;
+ public static boolean enderDragonAlwaysDropsFullExp = false;
private static void enderDragonSettings() {
if (version < 2) {
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);
public boolean enderDragonAlwaysDropsEggBlock = false;
+ public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
+ enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender-dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
}
public static boolean tulipsChangeFoxType = true;
public boolean foxTypeChangesWithTulips = true;
--
2.24.0.rc1
2.24.0