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

Add more details in purpur config header

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-21 14:43:09 -05:00
parent 222ce27b6e
commit 90f0fd289f
10 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4e655a9a968797ea5ba3b56d3e7735d0f97e3abf Mon Sep 17 00:00:00 2001 From 135c65d603a658d4a6c5690a34b48c6f5b347b40 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
@@ -6,16 +6,16 @@ Subject: [PATCH] Purpur config files
--- ---
.../net/minecraft/server/DedicatedServer.java | 8 ++ .../net/minecraft/server/DedicatedServer.java | 8 ++
src/main/java/net/minecraft/server/World.java | 3 + src/main/java/net/minecraft/server/World.java | 3 +
.../java/net/pl3x/purpur/PurpurConfig.java | 105 ++++++++++++++++++ .../java/net/pl3x/purpur/PurpurConfig.java | 113 ++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 63 +++++++++++ .../net/pl3x/purpur/PurpurWorldConfig.java | 63 ++++++++++
.../org/bukkit/craftbukkit/CraftServer.java | 2 + .../org/bukkit/craftbukkit/CraftServer.java | 2 +
.../java/org/bukkit/craftbukkit/Main.java | 8 ++ .../java/org/bukkit/craftbukkit/Main.java | 8 ++
6 files changed, 189 insertions(+) 6 files changed, 197 insertions(+)
create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 3d452fe0e..22e81ee10 100644 index 3d452fe0e3..22e81ee105 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -172,6 +172,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -172,6 +172,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -34,7 +34,7 @@ index 3d452fe0e..22e81ee10 100644
// Paper end // Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e4f2aeed2..030d44c2e 100644 index 1defbd9747..b37e081fc3 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose @@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -56,10 +56,10 @@ index e4f2aeed2..030d44c2e 100644
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644 new file mode 100644
index 000000000..e91bd0a36 index 0000000000..108450adcb
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,105 @@ @@ -0,0 +1,113 @@
+package net.pl3x.purpur; +package net.pl3x.purpur;
+ +
+import com.google.common.base.Throwables; +import com.google.common.base.Throwables;
@@ -77,7 +77,15 @@ index 000000000..e91bd0a36
+ +
+public class PurpurConfig { +public class PurpurConfig {
+ private static final int CONFIG_VERSION = 1; + private static final int CONFIG_VERSION = 1;
+ private static final String HEADER = "This is the main configuration file for Purpur."; + 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"
+ + "\n"
+ + "If you need help with the configuration or have any questions related to Purpur,\n"
+ + "join us in our Discord guild.\n"
+ + "\n"
+ + "Website: https://pl3x.net \n"
+ + "Docs: https://purpur.readthedocs.org/ \n";
+ private static File CONFIG_FILE; + private static File CONFIG_FILE;
+ static YamlConfiguration config; + static YamlConfiguration config;
+ private static int version; + private static int version;
@@ -167,7 +175,7 @@ index 000000000..e91bd0a36
+} +}
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..30f11fe26 index 0000000000..30f11fe261
--- /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,63 @@ @@ -0,0 +1,63 @@
@@ -235,7 +243,7 @@ index 000000000..30f11fe26
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5500c3a22..b04abedb2 100644 index 9f78e85438..e7d80fd58c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -788,6 +788,7 @@ public final class CraftServer implements Server { @@ -788,6 +788,7 @@ public final class CraftServer implements Server {
@@ -255,7 +263,7 @@ index 5500c3a22..b04abedb2 100644
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 405ea5c46..2d60e7588 100644 index 405ea5c465..2d60e75883 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -137,6 +137,14 @@ public class Main { @@ -137,6 +137,14 @@ public class Main {

10
patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From c44024e655fce6d2e2b9f63f66ae868d0072470e Mon Sep 17 00:00:00 2001 From e5c8e31b455e9e54bd0f575a0f2f6af2e8840227 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 to mooshroom when fed mushrooms Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -10,7 +10,7 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
3 files changed, 81 insertions(+), 1 deletion(-) 3 files changed, 81 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 3c6dc5ef0..fc203f5fb 100644 index fae57a0998..352b6dfb3e 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -999,6 +999,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -999,6 +999,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 3c6dc5ef0..fc203f5fb 100644
if (!this.isSilent()) { if (!this.isSilent()) {
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1); this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1);
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index d2c2e3cc3..f053ff0e5 100644 index d2c2e3cc33..f053ff0e50 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java --- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -1,9 +1,14 @@ @@ -1,9 +1,14 @@
@@ -131,10 +131,10 @@ index d2c2e3cc3..f053ff0e5 100644
public EntityCow createChild(EntityAgeable entityageable) { public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world); return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e91bd0a36..88835089c 100644 index 108450adcb..dd73d846ab 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -102,4 +102,9 @@ public class PurpurConfig { @@ -110,4 +110,9 @@ public class PurpurConfig {
config.addDefault(path, def); config.addDefault(path, def);
return config.getString(path, config.getString(path)); return config.getString(path, config.getString(path));
} }

8
patches/server/0007-Snowman-set-pumpkin-on-off-by-player-interaction.patch
View File

@@ -1,4 +1,4 @@
From 84f371a48a082ec8dbc2469d3e750876617509fe Mon Sep 17 00:00:00 2001 From 896623d503e309ef34c1f9b38157852cec97645e 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 set pumpkin on/off by player interaction Subject: [PATCH] Snowman set pumpkin on/off by player interaction
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman set pumpkin on/off by player interaction
2 files changed, 26 insertions(+), 1 deletion(-) 2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 8677f0818..fb36306b9 100644 index 8677f08184..fb36306b90 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java --- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java +++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -2,12 +2,14 @@ package net.minecraft.server; @@ -2,12 +2,14 @@ package net.minecraft.server;
@@ -60,10 +60,10 @@ index 8677f0818..fb36306b9 100644
return super.a(entityhuman, enumhand); return super.a(entityhuman, enumhand);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 88835089c..8f3367ae1 100644 index dd73d846ab..25112d6570 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -107,4 +107,11 @@ public class PurpurConfig { @@ -115,4 +115,11 @@ public class PurpurConfig {
private static void cowsSettings() { private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows); feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
} }

8
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From bae1d45340b4d2075134599f8bd63b8b79890915 Mon Sep 17 00:00:00 2001 From 4cd56e03a9b64f2ff37640eab922f48e258a1846 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, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -4091,10 +4091,10 @@ index a2fc2cd802..8f064526b2 100644
return (d0 * d0 >= 0.029999999329447746D || this.b.pitch == 0.0F || Math.abs(this.b.pitch) >= 10.0F || !this.b.isInWater()) && !this.b.onGround; return (d0 * d0 >= 0.029999999329447746D || this.b.pitch == 0.0F || Math.abs(this.b.pitch) >= 10.0F || !this.b.isInWater()) && !this.b.onGround;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 8f3367ae1d..e536e83ea1 100644 index 25112d6570..7239ad273a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -103,6 +103,11 @@ public class PurpurConfig { @@ -111,6 +111,11 @@ public class PurpurConfig {
return config.getString(path, config.getString(path)); return config.getString(path, config.getString(path));
} }
@@ -4106,7 +4106,7 @@ index 8f3367ae1d..e536e83ea1 100644
public static int feedMushroomsToCows = 5; public static int feedMushroomsToCows = 5;
private static void cowsSettings() { private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows); feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
@@ -114,4 +119,117 @@ public class PurpurConfig { @@ -122,4 +127,117 @@ public class PurpurConfig {
snowmanDropsPumpkin = getBoolean("settings.mobs.snow_golem.drops-pumpkin-when-sheared", snowmanDropsPumpkin); snowmanDropsPumpkin = getBoolean("settings.mobs.snow_golem.drops-pumpkin-when-sheared", snowmanDropsPumpkin);
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack); snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
} }

12
patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch
View File

@@ -1,4 +1,4 @@
From 56ee0afc64f085c3555035967353013e12274f51 Mon Sep 17 00:00:00 2001 From e527d46c950ca5654441e03dea8f583749779fa0 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] Make giants naturally spawn and have AI Subject: [PATCH] Make giants naturally spawn and have AI
@@ -11,7 +11,7 @@ Subject: [PATCH] Make giants naturally spawn and have AI
4 files changed, 62 insertions(+), 1 deletion(-) 4 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
index 72eb669c5..f1500f7a0 100644 index 72eb669c50..f1500f7a0e 100644
--- a/src/main/java/net/minecraft/server/BiomeBase.java --- a/src/main/java/net/minecraft/server/BiomeBase.java
+++ b/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -97,6 +97,7 @@ public abstract class BiomeBase { @@ -97,6 +97,7 @@ public abstract class BiomeBase {
@@ -23,7 +23,7 @@ index 72eb669c5..f1500f7a0 100644
((List) this.u.get(enumcreaturetype)).add(biomebase_biomemeta); ((List) this.u.get(enumcreaturetype)).add(biomebase_biomemeta);
} }
diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
index f4698a680..3f7f7a2de 100644 index f4698a6809..3f7f7a2de8 100644
--- a/src/main/java/net/minecraft/server/Biomes.java --- a/src/main/java/net/minecraft/server/Biomes.java
+++ b/src/main/java/net/minecraft/server/Biomes.java +++ b/src/main/java/net/minecraft/server/Biomes.java
@@ -92,5 +92,30 @@ public abstract class Biomes { @@ -92,5 +92,30 @@ public abstract class Biomes {
@@ -58,7 +58,7 @@ index f4698a680..3f7f7a2de 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index b7e2022b1..d618c23ef 100644 index b7e2022b19..d618c23ef8 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
@@ -106,10 +106,10 @@ index b7e2022b1..d618c23ef 100644
} }
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 1f8e83110..38f9d3a3a 100644 index 7239ad273a..9e4adbb56c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -113,6 +113,13 @@ public class PurpurConfig { @@ -121,6 +121,13 @@ public class PurpurConfig {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows); feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
} }

8
patches/server/0017-Tick-loop-config-options.patch
View File

@@ -1,4 +1,4 @@
From 4bbc098121fe0157622312f0ae244fb124d1db4b Mon Sep 17 00:00:00 2001 From 73b651b11025e6e1648f0443de1e6f7e946c1deb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 22 May 2019 22:30:08 -0500 Date: Wed, 22 May 2019 22:30:08 -0500
Subject: [PATCH] Tick loop config options Subject: [PATCH] Tick loop config options
@@ -9,7 +9,7 @@ Subject: [PATCH] Tick loop config options
2 files changed, 28 insertions(+), 10 deletions(-) 2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fc57f154f..0a4d37cd4 100644 index fc57f154f5..0a4d37cd42 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -865,16 +865,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -865,16 +865,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -59,10 +59,10 @@ index fc57f154f..0a4d37cd4 100644
this.methodProfiler.exit(); this.methodProfiler.exit();
this.methodProfiler.b(); this.methodProfiler.b();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 38f9d3a3a..99b7abd6d 100644 index 9e4adbb56c..d898522095 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -103,6 +103,13 @@ public class PurpurConfig { @@ -111,6 +111,13 @@ public class PurpurConfig {
return config.getString(path, config.getString(path)); return config.getString(path, config.getString(path));
} }

8
patches/server/0019-Packed-Barrels.patch
View File

@@ -1,4 +1,4 @@
From 573ce3778d45ecc00e8819789636f22713f9a29a Mon Sep 17 00:00:00 2001 From d20e4109ad982a6786df88e400ea100271d6ceb4 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, 23 May 2019 21:50:37 -0500 Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Packed Barrels Subject: [PATCH] Packed Barrels
@@ -9,7 +9,7 @@ Subject: [PATCH] Packed Barrels
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
index 4c71d8e1d..045bf3b6b 100644 index 4c71d8e1d1..045bf3b6b3 100644
--- a/src/main/java/net/minecraft/server/TileEntityBarrel.java --- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
+++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java +++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
@@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable { @@ -56,7 +56,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -39,10 +39,10 @@ index 4c71d8e1d..045bf3b6b 100644
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 99b7abd6d..95f754bfb 100644 index d898522095..3f89fb222a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -134,6 +134,11 @@ public class PurpurConfig { @@ -142,6 +142,11 @@ public class PurpurConfig {
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack); snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
} }

8
patches/server/0024-Always-place-dragon-egg-when-dragon-is-killed.patch
View File

@@ -1,4 +1,4 @@
From 55edf4be8c6548241d2a05810676c19f4bd00ddc Mon Sep 17 00:00:00 2001 From b83ace346ad25db57b1c0db8024b2480bfd64ba6 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, 1 Jun 2019 01:16:35 -0500 Date: Sat, 1 Jun 2019 01:16:35 -0500
Subject: [PATCH] Always place dragon egg when dragon is killed Subject: [PATCH] Always place dragon egg when dragon is killed
@@ -9,7 +9,7 @@ Subject: [PATCH] Always place dragon egg when dragon is killed
2 files changed, 8 insertions(+), 1 deletion(-) 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java 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 6700c8c658..f0c77eb6c1 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/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; @@ -13,6 +13,8 @@ import java.util.Set;
@@ -31,10 +31,10 @@ index 6700c8c65..f0c77eb6c 100644
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 95f754bfb..65a7b6e8b 100644 index 3f89fb222a..e7ce46002a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig { @@ -147,6 +147,11 @@ public class PurpurConfig {
packedBarrels = getBoolean("settings.packed-barrels", packedBarrels); packedBarrels = getBoolean("settings.packed-barrels", packedBarrels);
} }

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

@@ -1,4 +1,4 @@
From 6a9d02c679800715ed3284f5d2f9e447981a8de7 Mon Sep 17 00:00:00 2001 From 4aedd5650bafc65683e95343338459516781dc43 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
2 files changed, 6 insertions(+) 2 files changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 41ad48c96..632d16caf 100644 index 41ad48c963..632d16cafd 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -14,6 +14,7 @@ public class EntityIronGolem extends EntityGolem { @@ -14,6 +14,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,10 +21,10 @@ index 41ad48c96..632d16caf 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)); this.goalSelector.a(2, new PathfinderGoalStrollVillage(this, 0.6D));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 65a7b6e8b..74d238d82 100644 index e7ce46002a..c808ed50ef 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -127,6 +127,11 @@ public class PurpurConfig { @@ -135,6 +135,11 @@ public class PurpurConfig {
giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI); giantsHaveAI = getBoolean("settings.mobs.giant.have-ai", giantsHaveAI);
} }

8
patches/server/0032-Phantoms-spawn-naturally-in-the-end.patch
View File

@@ -1,4 +1,4 @@
From 1bb27847681cd965a4519b727bc43ce2251c3be0 Mon Sep 17 00:00:00 2001 From 25302a92dd438714b58ac0d0e2c97c626720e44c 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, 20 Jun 2019 18:48:58 -0500 Date: Thu, 20 Jun 2019 18:48:58 -0500
Subject: [PATCH] Phantoms spawn naturally in the end Subject: [PATCH] Phantoms spawn naturally in the end
@@ -29,7 +29,7 @@ index 6592d15291..67cb1520be 100644
} }
} }
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 238c68edf5..9b03334db2 100644 index 5808363b0f..49ae359675 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java --- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -10,7 +10,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -10,7 +10,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -97,10 +97,10 @@ index d7e1ed073d..7fd14b807f 100644
default: default:
IBlockData iblockdata1 = iworldreader.getType(blockposition2); IBlockData iblockdata1 = iworldreader.getType(blockposition2);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 9764221e82..a3cf1130e7 100644 index c808ed50ef..afe16a7f55 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -132,6 +132,11 @@ public class PurpurConfig { @@ -140,6 +140,11 @@ public class PurpurConfig {
ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims); ironGolemSwims = getBoolean("settings.mobs.iron_golem.swims", ironGolemSwims);
} }