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

Tuinity! \o/

Browse Source
This commit is contained in:
William Blake Galbreath
2020-07-01 19:31:44 -05:00
parent 2b54ad49f6
commit 7503e60580
127 changed files with 7711 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7163
patches/server/0001-Tuinity-Server-Changes.patch Normal file
View File

File diff suppressed because it is too large Load Diff

55
patches/server/0001-Rebrand.patch → patches/server/0002-Rebrand.patch
View File

@@ -1,33 +1,33 @@
From 4c46391a0e33451b0574cacdc1596a713f90f05d Mon Sep 17 00:00:00 2001
From 1785535c59fd991e1c0eeb05bd4834135cb1cfbe Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
---
pom.xml | 33 +++--
pom.xml | 35 ++++--
.../paper/console/PaperConsole.java | 2 +-
.../net/minecraft/server/MinecraftServer.java | 2 +-
.../net/pl3x/purpur/PurpurVersionFetcher.java | 115 ++++++++++++++++++
.../org/bukkit/craftbukkit/CraftServer.java | 2 +-
.../craftbukkit/util/CraftMagicNumbers.java | 2 +-
.../bukkit/craftbukkit/util/Versioning.java | 2 +-
7 files changed, 143 insertions(+), 15 deletions(-)
7 files changed, 144 insertions(+), 16 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index ef8ee637a..8044fa074 100644
index 6fd596817..285fa63b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>paper</artifactId>
- <artifactId>tuinity</artifactId>
+ <artifactId>purpur</artifactId>
<packaging>jar</packaging>
<version>1.16.1-R0.1-SNAPSHOT</version>
- <name>Paper</name>
- <url>https://papermc.io</url>
- <name>Tuinity-Server</name>
- <url>https://github.com/Spottedleaf/Tuinity</url>
-
+ <name>Purpur</name>
+ <url>http://pl3x.net</url>
@@ -38,8 +38,8 @@ index ef8ee637a..8044fa074 100644
</properties>
<parent>
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-parent</artifactId>
- <groupId>com.tuinity</groupId>
- <artifactId>tuinity-parent</artifactId>
+ <groupId>net.pl3x.purpur</groupId>
+ <artifactId>purpur-parent</artifactId>
<version>dev-SNAPSHOT</version>
@@ -48,8 +48,8 @@ index ef8ee637a..8044fa074 100644
<dependencies>
<dependency>
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-api</artifactId>
- <groupId>com.tuinity</groupId>
- <artifactId>tuinity-api</artifactId>
+ <groupId>net.pl3x.purpur</groupId>
+ <artifactId>purpur-api</artifactId>
<version>${project.version}</version>
@@ -76,20 +76,21 @@ index ef8ee637a..8044fa074 100644
<dependency>
<groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId>
@@ -164,7 +177,7 @@
@@ -164,15 +177,15 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
- <finalName>paper-${minecraft.version}</finalName>
- <finalName>tuinity-${minecraft.version}</finalName>
- <defaultGoal>install</defaultGoal> <!-- Paper -->
+ <finalName>purpur-${minecraft.version}</finalName>
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
+ <defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins>
<plugin>
@@ -172,7 +185,7 @@
<groupId>com.lukegb.mojo</groupId>
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
- <outputPrefix>git-Paper-</outputPrefix>
- <outputPrefix>git-Tuinity-</outputPrefix> <!-- Tuinity -->
+ <outputPrefix>git-Purpur-</outputPrefix>
<scmDirectory>..</scmDirectory>
</configuration>
@@ -108,15 +109,15 @@ index 74ed02fa9..c1280478e 100644
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 26f230a80..d06536aba 100644
index eb71fa6e3..e23e47ee7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1446,7 +1446,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
- return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Purpur"; // Purpur // Paper // Spigot // CraftBukkit
- return "Tuinity"; // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Purpur"; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
}
public CrashReport b(CrashReport crashreport) {
@@ -242,15 +243,15 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3bbc2d78b..1d5cb1548 100644
index cebcb845b..56a2db25f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
- private final String serverName = "Paper"; // Paper
+ private final String serverName = "Purpur"; // Paper // Purpur
- private final String serverName = "Tuinity"; // Paper // Tuinity
+ private final String serverName = "Purpur"; // Paper // Tuinity // Purpur
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -268,15 +269,15 @@ index f1e60981a..1fe87d763 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 674096cab..e9aee2d8a 100644
index 001b1e519..13b984393 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {
public static String getBukkitVersion() {
String result = "Unknown-Version";
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.destroystokyo.paper/paper-api/pom.properties");
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.pl3x.purpur/purpur-api/pom.properties"); // Purpur
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.tuinity/tuinity-api/pom.properties"); // Tuinity
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.pl3x.purpur/purpur-api/pom.properties"); // Tuinity // Purpur
Properties properties = new Properties();
if (stream != null) {

85
patches/server/0002-Purpur-config-files.patch → patches/server/0003-Purpur-config-files.patch
View File

@@ -1,24 +1,24 @@
From 99870e5b09eef243de5335b21a4efbeb4b427322 Mon Sep 17 00:00:00 2001
From a4e1b9d46aea64612ae6df1aa6e8e4f8e63962f6 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
---
.../java/com/destroystokyo/paper/Metrics.java | 6 +-
.../java/com/destroystokyo/paper/Metrics.java | 7 +-
.../net/minecraft/server/DedicatedServer.java | 9 ++
src/main/java/net/minecraft/server/World.java | 2 +
.../java/net/pl3x/purpur/PurpurConfig.java | 130 ++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 67 +++++++++
.../pl3x/purpur/command/PurpurCommand.java | 67 +++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 59 ++++++++
.../pl3x/purpur/command/PurpurCommand.java | 65 +++++++++
.../org/bukkit/craftbukkit/CraftServer.java | 15 ++
.../java/org/bukkit/craftbukkit/Main.java | 8 ++
8 files changed, 301 insertions(+), 3 deletions(-)
8 files changed, 292 insertions(+), 3 deletions(-)
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/command/PurpurCommand.java
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 24641501a..b767dd1d0 100644
index 24641501a..78369e670 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -581,7 +581,7 @@ public class Metrics {
@@ -30,7 +30,7 @@ index 24641501a..b767dd1d0 100644
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
@@ -590,8 +590,8 @@ public class Metrics {
@@ -590,8 +590,9 @@ public class Metrics {
}));
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
@@ -38,11 +38,12 @@ index 24641501a..b767dd1d0 100644
- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
+ metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (Bukkit.spigot().getSpigotConfig().getBoolean("settings.bungeecord") ? "bungee" : "offline"))); // Purpur
+ metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
+
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 8b2755a3b..df75a9e8a 100644
index 578f7809c..21dc3b9a6 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -168,6 +168,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -60,27 +61,27 @@ index 8b2755a3b..df75a9e8a 100644
+ // Purpur end
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
// Paper end
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b598c4869..c59282ef3 100644
index 8df4ef488..aaef3bf59 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -91,6 +91,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public boolean populating;
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
+ public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
@@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
@@ -120,6 +121,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
protected World(WorldDataMutable worlddatamutable, ResourceKey<World> resourcekey, ResourceKey<DimensionManager> resourcekey1, DimensionManager dimensionmanager, Supplier<GameProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((WorldDataServer) worlddatamutable).getName()); // Spigot
public final com.tuinity.tuinity.config.TuinityConfig.WorldConfig tuinityConfig; // Tuinity - Server Config
+ public final net.pl3x.purpur.PurpurWorldConfig purpurConfig; // Purpur
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPosition lastPhysicsProblem; // Spigot
@@ -124,6 +125,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.spigotConfig); // Paper
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((WorldDataServer)worlddatamutable).getName()), this.paperConfig, this.spigotConfig); // Purpur
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
this.tuinityConfig = new com.tuinity.tuinity.config.TuinityConfig.WorldConfig(((WorldDataServer)worlddatamutable).getName()); // Tuinity - Server Config
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig((((WorldDataServer)worlddatamutable).getName())); // Purpur
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
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
new file mode 100644
index 000000000..333c880bf
@@ -219,30 +220,22 @@ index 000000000..333c880bf
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
new file mode 100644
index 000000000..eda37fa43
index 000000000..8c4b5f514
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,67 @@
@@ -0,0 +1,59 @@
+package net.pl3x.purpur;
+
+import com.destroystokyo.paper.PaperWorldConfig;
+import org.bukkit.configuration.ConfigurationSection;
+import org.spigotmc.SpigotWorldConfig;
+
+import java.util.List;
+
+import static net.pl3x.purpur.PurpurConfig.log;
+
+public class PurpurWorldConfig {
+
+ private final String worldName;
+ private final PaperWorldConfig paperConfig;
+ private final SpigotWorldConfig spigotConfig;
+
+ public PurpurWorldConfig(String worldName, PaperWorldConfig paperConfig, SpigotWorldConfig spigotConfig) {
+ public PurpurWorldConfig(String worldName) {
+ this.worldName = worldName;
+ this.paperConfig = paperConfig;
+ this.spigotConfig = spigotConfig;
+ init();
+ }
+
@@ -292,10 +285,10 @@ index 000000000..eda37fa43
+}
diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
new file mode 100644
index 000000000..7d983d9a5
index 000000000..4904be939
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
@@ -0,0 +1,67 @@
@@ -0,0 +1,65 @@
+package net.pl3x.purpur.command;
+
+import net.minecraft.server.MinecraftServer;
@@ -351,9 +344,7 @@ index 000000000..7d983d9a5
+ console.server.reloadCount++;
+
+ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Purpur config reload complete.");
+ }
+
+ else if (args[0].equalsIgnoreCase("version")) {
+ } else if (args[0].equalsIgnoreCase("version")) {
+ Command verCmd = org.bukkit.Bukkit.getServer().getCommandMap().getCommand("version");
+ if (verCmd != null) {
+ return verCmd.execute(sender, commandLabel, new String[0]);
@@ -364,26 +355,26 @@ index 000000000..7d983d9a5
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1026fd81b..6c602ef79 100644
index 56a2db25f..957baebc4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -846,6 +846,7 @@ public final class CraftServer implements Server {
@@ -847,6 +847,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
+ net.pl3x.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -880,6 +881,7 @@ public final class CraftServer implements Server {
}
@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
+ world.purpurConfig.init(); // Purpur
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -898,6 +900,7 @@ public final class CraftServer implements Server {
@@ -900,6 +902,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -391,9 +382,9 @@ index 1026fd81b..6c602ef79 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2204,6 +2207,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
@@ -2217,6 +2220,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report
+ // Purpur start
+ @Override
@@ -411,12 +402,12 @@ index 1026fd81b..6c602ef79 100644
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 83151f3d7..8879c6421 100644
index a216b1336..c1e7e6a45 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -139,6 +139,14 @@ public class Main {
@@ -146,6 +146,14 @@ public class Main {
.describedAs("Yml file");
// Paper end
/* Conctete End - Server Config */
+ // Purpur Start
+ acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")

18
patches/server/0003-Timings-stuff.patch → patches/server/0004-Timings-stuff.patch
View File

@@ -1,34 +1,36 @@
From 89bd8621126f5990f782a9709221523940f229df Mon Sep 17 00:00:00 2001
From bc659814e1291b1efc14e0b8c7940db3423008d6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 Jun 2020 21:30:19 -0500
Subject: [PATCH] Timings stuff
---
.../java/co/aikar/timings/TimingsExport.java | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
.../java/co/aikar/timings/TimingsExport.java | 27 +++++++++++++++----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index e33e889c2..29174d903 100644
index 5dfa06588..dae2e5d70 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -227,9 +227,13 @@ public class TimingsExport extends Thread {
@@ -227,10 +227,14 @@ public class TimingsExport extends Thread {
// Information on the users Config
parent.put("config", createObject(
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Tuinity - add config to timings report
- pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)) // Tuinity - add config to timings report
+ // Purpur start
+ pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
+ pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
+ pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
+ pair("tuinity", mapAsJSON(Bukkit.spigot().getTuinityConfig(), null)), // Tuinity - add config to timings report
+ pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
+ // Purpur end
));
new TimingsExport(listeners, parent, history).start();
@@ -270,6 +274,19 @@ public class TimingsExport extends Thread {
@@ -271,6 +275,19 @@ public class TimingsExport extends Thread {
return timingsCost;
}
@@ -48,7 +50,7 @@ index e33e889c2..29174d903 100644
private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
JSONObject object = new JSONObject();
@@ -306,7 +323,7 @@ public class TimingsExport extends Thread {
@@ -307,7 +324,7 @@ public class TimingsExport extends Thread {
String response = null;
String timingsURL = null;
try {

2
patches/server/0004-Barrels-and-enderchests-6-rows.patch → patches/server/0005-Barrels-and-enderchests-6-rows.patch
View File

@@ -1,4 +1,4 @@
From 6946e2a10fd1cb63084783c07c277936405d9b65 Mon Sep 17 00:00:00 2001
From 1bbb9cf5c61f902c0c65e8cdc41ae27b6c3fc9c6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 21:50:37 -0500
Subject: [PATCH] Barrels and enderchests 6 rows

2
patches/server/0005-Advancement-API.patch → patches/server/0006-Advancement-API.patch
View File

@@ -1,4 +1,4 @@
From f38bc41c719f4ec2f111350a6fb57cdf1cb1444a Mon Sep 17 00:00:00 2001
From f9e2498834beb19689a969fb82358791dead4355 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 31 May 2019 21:24:33 -0500
Subject: [PATCH] Advancement API

2
patches/server/0006-Llama-API.patch → patches/server/0007-Llama-API.patch
View File

@@ -1,4 +1,4 @@
From ce23a90cbb5d648a846bdfc45696a55bab8a3ed9 Mon Sep 17 00:00:00 2001
From 70dd31ae817bfcfb9e4b293673d48d009fcf73e1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:50:12 -0500
Subject: [PATCH] Llama API

2
patches/server/0007-Evoker-API.patch → patches/server/0008-Evoker-API.patch
View File

@@ -1,4 +1,4 @@
From b509638d3539212f7aa2d9dd86aebaac925ac2ab Mon Sep 17 00:00:00 2001
From dfb25a8ebbc77cc96c5f8b3a7efb69c887e13669 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:29:02 -0500
Subject: [PATCH] Evoker API

42
patches/server/0008-AFK-API.patch → patches/server/0009-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 331e2763353e816b3e1e8aa237d2343967486f2c Mon Sep 17 00:00:00 2001
From 9cd56eb534d4b80984130f44742196cab273b9c4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] AFK API
@@ -18,10 +18,10 @@ Subject: [PATCH] AFK API
11 files changed, 120 insertions(+), 25 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fcb3d3adae..405a5d87d8 100644
index f8ca56be8..3ba812843 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1384,6 +1384,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1571,6 +1571,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}
@@ -30,7 +30,7 @@ index fcb3d3adae..405a5d87d8 100644
double d3 = this.locX() - d0;
double d4 = this.locY() - d1;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 2cada09ced..a69a698594 100644
index 2cada09ce..a69a69859 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -50,7 +50,7 @@ index 2cada09ced..a69a698594 100644
super(EntityTypes.PLAYER, world);
this.bS = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index eeed8edfdf..508a91418e 100644
index eeed8edfd..508a91418 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -109,10 +109,10 @@ index eeed8edfdf..508a91418e 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 267a6baae8..d3ea51c27c 100644
index 0edcb775e..dfa8f3439 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -143,28 +143,18 @@ public interface IEntityAccess {
@@ -144,28 +144,18 @@ public interface IEntityAccess {
}
// Paper end
@@ -154,7 +154,7 @@ index 267a6baae8..d3ea51c27c 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index a52dd0c021..9b4795f3bd 100644
index a52dd0c02..9b4795f3b 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -174,7 +174,7 @@ index a52dd0c021..9b4795f3bd 100644
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cf83059fec..0d8daf4569 100644
index c40255263..6be2c0192 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -190,7 +190,7 @@ index cf83059fec..0d8daf4569 100644
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
@@ -448,6 +454,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -455,6 +461,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -199,7 +199,7 @@ index cf83059fec..0d8daf4569 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1117,7 +1125,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1129,7 +1137,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
flag1 = true;
@@ -208,7 +208,7 @@ index cf83059fec..0d8daf4569 100644
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1156,6 +1164,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1168,6 +1176,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -218,10 +218,10 @@ index cf83059fec..0d8daf4569 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 3a740f5669..1dfd8a9598 100644
index 6d37bbfeb..578cc6888 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -425,7 +425,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -862,7 +862,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// CraftBukkit end
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -230,7 +230,7 @@ index 3a740f5669..1dfd8a9598 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -745,7 +745,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1182,7 +1182,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -240,7 +240,7 @@ index 3a740f5669..1dfd8a9598 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fc38163b19..cc08ad33e4 100644
index fc38163b1..cc08ad33e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@
@@ -266,10 +266,10 @@ index fc38163b19..cc08ad33e4 100644
private static void timingsSettings() {
timingsUrl = getString("settings.timings.url", timingsUrl);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index eda37fa43f..5fa3330373 100644
index 8c4b5f514..9ec1c5ce8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -64,4 +64,15 @@ public class PurpurWorldConfig {
@@ -56,4 +56,15 @@ public class PurpurWorldConfig {
PurpurConfig.config.addDefault("world-settings.default." + path, def);
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}
@@ -286,10 +286,10 @@ index eda37fa43f..5fa3330373 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 97a24b4dff..3bd2ffc206 100644
index c7b4e5f2a..0ca6763ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2128,4 +2128,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2143,4 +2143,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end
@@ -312,7 +312,7 @@ index 97a24b4dff..3bd2ffc206 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f78e44e05f..da4c49daf4 100644
index f78e44e05..da4c49daf 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange

6
patches/server/0009-Bring-back-server-name.patch → patches/server/0010-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From fb7aa2524aa13598c3a498a60c44795a2647522f Mon Sep 17 00:00:00 2001
From d8fc6c9dbc51e6fc4cf815ea6db5c23e37ec1387 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:19:14 -0500
Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 6786fd094..8a9be3fdb 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6c602ef79..39aa8c336 100644
index 957baebc4..e7d60c114 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2356,4 +2356,11 @@ public final class CraftServer implements Server {
@@ -2369,4 +2369,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end

10
patches/server/0010-Configurable-server-mod-name.patch → patches/server/0011-Configurable-server-mod-name.patch
View File

@@ -1,4 +1,4 @@
From 8cabdcc1fff88ba9e699619de4a6898a2c3ab69d Mon Sep 17 00:00:00 2001
From a06e9db2cd0bedea59034541a472cb2d32d439f5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name
@@ -9,15 +9,15 @@ Subject: [PATCH] Configurable server mod name
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0d0998b06..377cd8812 100644
index e23e47ee7..ba0260fa5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1446,7 +1446,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1504,7 +1504,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
- return "Purpur"; // Purpur // Paper // Spigot // CraftBukkit
+ return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur // Paper // Spigot // CraftBukkit
- return "Purpur"; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
+ return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
}
public CrashReport b(CrashReport crashreport) {

4
patches/server/0011-LivingEntity-safeFallDistance.patch → patches/server/0012-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From cf295f5a020f34fbf464fb820db12df399df7586 Mon Sep 17 00:00:00 2001
From 2ae8c1ce21cbcd4061616fbe7cbd2ff5550437b1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] LivingEntity safeFallDistance
@@ -36,7 +36,7 @@ index 364697e01..ee7a2fedd 100644
protected int getChestSlots() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7a2140e4b..732a3f21d 100644
index 70c2be22b..ceeb0c4c1 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {

6
patches/server/0012-MoonPhase-API.patch → patches/server/0013-MoonPhase-API.patch
View File

@@ -1,4 +1,4 @@
From 2806cb90116acb2347f20188c1cebf6ad2ac7d84 Mon Sep 17 00:00:00 2001
From a30746c5569efc03352fc4fbb82c0a76545ab483 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:16 -0600
Subject: [PATCH] MoonPhase API
@@ -8,10 +8,10 @@ Subject: [PATCH] MoonPhase API
1 file changed, 7 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 724c0816d..8506ca886 100644
index 21bd9f14e..0c721a5fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2613,4 +2613,11 @@ public class CraftWorld implements World {
@@ -2614,4 +2614,11 @@ public class CraftWorld implements World {
return spigot;
}
// Spigot end

10
patches/server/0013-Lagging-threshold.patch → patches/server/0014-Lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 66165fa04ec062dbe138f99824d32840512a43c1 Mon Sep 17 00:00:00 2001
From 2e657e19a4d8355da8e9c4fd5199b116b6bf83a7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Lagging threshold
3 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 377cd8812..822798741 100644
index ba0260fa5..8ed47fe05 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -28,7 +28,7 @@ index 377cd8812..822798741 100644
+ lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
}
midTickChunksTasksRan = 0; // Paper
// Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 3d779b0dc..d8b826f6b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -46,10 +46,10 @@ index 3d779b0dc..d8b826f6b 100644
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 39aa8c336..bca0487ad 100644
index e7d60c114..a1130d169 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2362,5 +2362,10 @@ public final class CraftServer implements Server {
@@ -2375,5 +2375,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}

2
patches/server/0014-ItemFactory-getMonsterEgg.patch → patches/server/0015-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From 2f75911f11ee50eb4f5cebfbc040042270e54e2f Mon Sep 17 00:00:00 2001
From 40ac51e22d65abd4574d247ecad7d26cea9a2e08 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 16:36:55 -0500
Subject: [PATCH] ItemFactory#getMonsterEgg

2
patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch → patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -1,4 +1,4 @@
From 00f1a7cbcc9ae0a4f2ad78b44287a34d81ed54e7 Mon Sep 17 00:00:00 2001
From 8ed07ea5498704c7c2228ba4d45cdafcb7ef8c14 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 5 Jul 2019 18:21:00 -0500
Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent

2
patches/server/0016-EMC-MonsterEggSpawnEvent.patch → patches/server/0017-EMC-MonsterEggSpawnEvent.patch
View File

@@ -1,4 +1,4 @@
From ebc3f075549750efdaf6d045a951b5082b1aa9c0 Mon Sep 17 00:00:00 2001
From 1a08ed0d95f59a8c98d8d06a6b01264c4a343cdd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 20 Jul 2013 22:40:56 -0400
Subject: [PATCH] EMC - MonsterEggSpawnEvent

2
patches/server/0017-Villager-resetOffers.patch → patches/server/0018-Villager-resetOffers.patch
View File

@@ -1,4 +1,4 @@
From f78891becd000d9c7787bc38deb9d35aa797405b Mon Sep 17 00:00:00 2001
From 21fe0113b78ebd98f56eba3feb429e3b0cc8e240 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 7 Oct 2019 00:15:37 -0500
Subject: [PATCH] Villager#resetOffers

6
patches/server/0018-World-getPlacementBlockData.patch → patches/server/0019-World-getPlacementBlockData.patch
View File

@@ -1,4 +1,4 @@
From bf81b900510fba99b4f8b9677f5ada6c49780e0d Mon Sep 17 00:00:00 2001
From b149fadd0450fc4ebca351978f38c5457a12a82a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:30:17 -0600
Subject: [PATCH] World#getPlacementBlockData
@@ -8,10 +8,10 @@ Subject: [PATCH] World#getPlacementBlockData
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8506ca886..0a6ee278b 100644
index 0c721a5fd..a9dfd40f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2619,5 +2619,10 @@ public class CraftWorld implements World {
@@ -2620,5 +2620,10 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}

2
patches/server/0019-LivingEntity-playPickupItemAnimation.patch → patches/server/0020-LivingEntity-playPickupItemAnimation.patch
View File

@@ -1,4 +1,4 @@
From ad5c59131a490f3a1acf7e51ec0a25698f1d5d40 Mon Sep 17 00:00:00 2001
From 53cdbac2ff0413c6af832bd4e331c3c8968a6afa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:25:16 -0500
Subject: [PATCH] LivingEntity#playPickupItemAnimation

2
patches/server/0020-SkeletonHorseTrapEvent-getPlayer.patch → patches/server/0021-SkeletonHorseTrapEvent-getPlayer.patch
View File

@@ -1,4 +1,4 @@
From 31aa2e07a779236b98b8415007409eed934d8452 Mon Sep 17 00:00:00 2001
From f607a151862c8aff8bb765024f5b408197d90f1a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:35:35 -0500
Subject: [PATCH] SkeletonHorseTrapEvent#getPlayer

2
patches/server/0021-PaperPR-PlayerItemCooldownEvent.patch → patches/server/0022-PaperPR-PlayerItemCooldownEvent.patch
View File

@@ -1,4 +1,4 @@
From 8a99e19fa0556853736568a269dd892342449daf Mon Sep 17 00:00:00 2001
From 453a7d6a6b56ff2546deef9f69f7d72dd013ce66 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Mon, 20 Apr 2020 13:57:06 +0200
Subject: [PATCH] PaperPR - PlayerItemCooldownEvent

4
patches/server/0022-EntityMoveEvent.patch → patches/server/0023-EntityMoveEvent.patch
View File

@@ -1,4 +1,4 @@
From c61f071c2eb1be7789fc51fc08b363eacf5e0473 Mon Sep 17 00:00:00 2001
From 0106f4613bfbb72f454d45b0da08a6f32be00744 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 11 Feb 2020 21:56:48 -0600
Subject: [PATCH] EntityMoveEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] EntityMoveEvent
1 file changed, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 732a3f21d..f917cd5df 100644
index ceeb0c4c1..a5262b88e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2790,6 +2790,20 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0023-PaperPR-Add-BellRingEvent.patch → patches/server/0024-PaperPR-Add-BellRingEvent.patch
View File

@@ -1,4 +1,4 @@
From 0d8728d2c77181579b7efcc4ca6d588d45f1615a Mon Sep 17 00:00:00 2001
From 8616ee18ee7da78b892222532f3b42d62e94d89d Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Mon, 24 Jun 2019 21:27:32 -0700
Subject: [PATCH] PaperPR - Add BellRingEvent

18
patches/server/0024-Player-invulnerabilities.patch → patches/server/0025-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 0828a5d793cb60992427e2f0af477835712183fb Mon Sep 17 00:00:00 2001
From d30691f6fe7bd486962d98a4ce81e115ce8237c1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
@@ -12,7 +12,7 @@ Subject: [PATCH] Player invulnerabilities
5 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 508a91418e..07f8f0fa7d 100644
index 508a91418..07f8f0fa7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -74,10 +74,10 @@ index 508a91418e..07f8f0fa7d 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0d8daf4569..47a7d1c034 100644
index 6be2c0192..e08143623 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1563,6 +1563,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1575,6 +1575,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -86,7 +86,7 @@ index 0d8daf4569..47a7d1c034 100644
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3c5ba8f2fd..5807e77dab 100644
index 3c5ba8f2f..5807e77da 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -869,6 +869,8 @@ public abstract class PlayerList {
@@ -99,10 +99,10 @@ index 3c5ba8f2fd..5807e77dab 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5fa3330373..bd9b82dadf 100644
index 9ec1c5ce8..1c9393f28 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -75,4 +75,11 @@ public class PurpurWorldConfig {
@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}
@@ -115,10 +115,10 @@ index 5fa3330373..bd9b82dadf 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3bd2ffc206..9b1c4d9320 100644
index 0ca6763ce..8dc0aeb3b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2144,5 +2144,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2159,5 +2159,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetIdleTimer();
}

2
patches/server/0025-Anvil-API.patch → patches/server/0026-Anvil-API.patch
View File

@@ -1,4 +1,4 @@
From 44cafc5974e016c61841d8fd29e480e8605416b0 Mon Sep 17 00:00:00 2001
From 55ca7128b336a2f50ca8c71e7c34ef4765ecee60 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 19 Apr 2020 00:17:56 -0500
Subject: [PATCH] Anvil API

6
patches/server/0026-Configurable-villager-brain-ticks.patch → patches/server/0027-Configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From c748533f4bbafc0c16603882168e2cbf46960287 Mon Sep 17 00:00:00 2001
From 68f62757b17a41d8e4158acc3d3ece8e3bb3d590 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] Configurable villager brain ticks
@@ -40,10 +40,10 @@ index bf019043a..7925c8991 100644
if (this.bM) {
this.bM = false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bd9b82dad..8f8e61442 100644
index 1c9393f28..644501d5e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -82,4 +82,11 @@ public class PurpurWorldConfig {
@@ -74,4 +74,11 @@ public class PurpurWorldConfig {
playerSpawnInvulnerableTicks = getInt("gameplay-mechanics.player.spawn-invulnerable-ticks", playerSpawnInvulnerableTicks);
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

6
patches/server/0027-Alternative-Keepalive-Handling.patch → patches/server/0028-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From 753e40b5abc1fde5f33910bd9b5a77898f44ea0d Mon Sep 17 00:00:00 2001
From 76fe7d6818cac45ef64e56665e4a57122c920e85 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 85016aa76..d2d96eacc 100644
index e08143623..36519882f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 85016aa76..d2d96eacc 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2704,6 +2720,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2716,6 +2732,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

2
patches/server/0028-Silk-touch-spawners.patch → patches/server/0029-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From 836c6dcd9b9cb396daeec8ddd59834f431bf1275 Mon Sep 17 00:00:00 2001
From 6c9014787c2208705d67fad563db8b13bd7e186a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners

2
patches/server/0029-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch → patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
View File

@@ -1,4 +1,4 @@
From 6bfbeb52d059e6241fbd31cb1c909fc4f4cd4e98 Mon Sep 17 00:00:00 2001
From 90b7e35a44d65b660f29b35707c5fe508baf086e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 21 Feb 2020 17:04:51 -0600
Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

6
patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch → patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch
View File

@@ -1,4 +1,4 @@
From 3cdc8d59eb0d60369650ba50ff81fb65b9f5ecc3 Mon Sep 17 00:00:00 2001
From 741df2b5d77b2223c04718fa78c8f19fead51cf3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
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
index 8f8e61442..3367cfd47 100644
index 644501d5e..741de8c51 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -83,6 +83,15 @@ public class PurpurWorldConfig {
@@ -75,6 +75,15 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

6
patches/server/0031-MC-4-Fix-Item-position-desync.patch → patches/server/0032-MC-4-Fix-Item-position-desync.patch
View File

@@ -1,4 +1,4 @@
From eabe6232aad2e846f11e6082b5d9510ad3aa658c Mon Sep 17 00:00:00 2001
From 9a719380dd77d81f543106abbe3a8f12ad72f054 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 21:12:58 -0500
Subject: [PATCH] MC-4 Fix - Item position desync
@@ -10,10 +10,10 @@ Subject: [PATCH] MC-4 Fix - Item position desync
3 files changed, 13 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index f75c09d44..10cae053b 100644
index bfb931268..e9bc546f8 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -133,6 +133,12 @@ public class EntityTrackerEntry {
@@ -134,6 +134,12 @@ public class EntityTrackerEntry {
double vec3d_dz = this.tracker.locZ() - 2.44140625E-4D*(this.zLoc);
boolean flag1 = (vec3d_dx * vec3d_dx + vec3d_dy * vec3d_dy + vec3d_dz * vec3d_dz) >= 7.62939453125E-6D;
// Paper end - reduce allocation of Vec3D here

2
patches/server/0032-Fix-vanilla-command-permission-handler.patch → patches/server/0033-Fix-vanilla-command-permission-handler.patch
View File

@@ -1,4 +1,4 @@
From 0efc3418e55cf91ac4cfedd251486777e746768d Mon Sep 17 00:00:00 2001
From b51bda6626891e402696410e1077c0246ab3de3e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Mar 2020 01:51:32 -0500
Subject: [PATCH] Fix vanilla command permission handler

2
patches/server/0033-Logger-settings-suppressing-pointless-logs.patch → patches/server/0034-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -1,4 +1,4 @@
From f6bc74d6d724638fe97b923a0caa06deced56b92 Mon Sep 17 00:00:00 2001
From 8801394ee2cd8754cf1d766b26a228910d1eea42 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:52:12 -0500
Subject: [PATCH] Logger settings (suppressing pointless logs)

6
patches/server/0034-Disable-outdated-build-check.patch → patches/server/0035-Disable-outdated-build-check.patch
View File

@@ -1,4 +1,4 @@
From 1926ac0f3c9733e80ebe5b761edc0b805bc59ed0 Mon Sep 17 00:00:00 2001
From c845120751b71ba6c9121c9c1c54cdf9ff4851c1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Dec 2019 12:53:59 -0600
Subject: [PATCH] Disable outdated build check
@@ -8,10 +8,10 @@ Subject: [PATCH] Disable outdated build check
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 8879c6421..2434a5af8 100644
index c1e7e6a45..38a982d3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -252,7 +252,7 @@ public class Main {
@@ -259,7 +259,7 @@ public class Main {
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
}

29
patches/server/0035-Giants-AI-settings.patch → patches/server/0036-Giants-AI-settings.patch
View File

@@ -1,42 +1,39 @@
From 44ff3cae556ebd8727d61cfc675f6d482b69fed6 Mon Sep 17 00:00:00 2001
From 2698d48eacd93e24ab955acc6dbce9c3ff90693d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Giants AI settings
---
.../minecraft/server/AttributeMapBase.java | 4 +-
.../minecraft/server/AttributeMapBase.java | 1 +
.../java/net/minecraft/server/Entity.java | 2 +-
.../minecraft/server/EntityGiantZombie.java | 63 ++++++++++++++++++-
.../minecraft/server/EntityInsentient.java | 6 +-
.../net/minecraft/server/EntityLiving.java | 2 +-
.../net/pl3x/purpur/PurpurWorldConfig.java | 17 +++++
6 files changed, 87 insertions(+), 7 deletions(-)
6 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/AttributeMapBase.java b/src/main/java/net/minecraft/server/AttributeMapBase.java
index c57e23e16..772079a27 100644
index c57e23e16..92aa104dc 100644
--- a/src/main/java/net/minecraft/server/AttributeMapBase.java
+++ b/src/main/java/net/minecraft/server/AttributeMapBase.java
@@ -41,8 +41,8 @@ public class AttributeMapBase {
@@ -41,6 +41,7 @@ public class AttributeMapBase {
}).collect(Collectors.toList());
}
- @Nullable
- public AttributeModifiable a(AttributeBase attributebase) {
+ @Nullable public AttributeModifiable getAttribute(AttributeBase attributebase) { return a(attributebase); } // Purpur - OBFHELPER
+ @Nullable public AttributeModifiable a(AttributeBase attributebase) {
@Nullable
public AttributeModifiable a(AttributeBase attributebase) {
return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> {
return this.d.a(this::a, attributebase1);
});
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3709f3386..ee36c537d 100644
index 3ba812843..7ecf832c2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public double D;
public double E;
public double F;
- public float G;
+ public float G; public void setStepHeight(float stepHeight) { this.G = stepHeight; } // Purpur - OBFHELPER
- public float G; public final float getStepHeight() { return this.G; } // Tuinity - OBFHELPER
+ public float G; public final float getStepHeight() { return this.G; } public void setStepHeight(float stepHeight) { this.G = stepHeight; } // Tuinity - OBFHELPER // Purpur - OBFHELPER
public boolean noclip;
public float I;
protected final Random random;
@@ -155,7 +152,7 @@ index 605bbf017..93714e5d9 100644
return false;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f917cd5df..03477c6e9 100644
index a5262b88e..69901be8b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2150,7 +2150,7 @@ public abstract class EntityLiving extends Entity {
@@ -168,10 +165,10 @@ index f917cd5df..03477c6e9 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3367cfd47..2db2dd26d 100644
index 741de8c51..96f4edaa8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -92,6 +92,23 @@ public class PurpurWorldConfig {
@@ -84,6 +84,23 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0036-Illusioners-AI-settings.patch → patches/server/0037-Illusioners-AI-settings.patch
View File

@@ -1,4 +1,4 @@
From 441173477d957d8b8af8f86d72cb50e22c99bfb8 Mon Sep 17 00:00:00 2001
From c6e42066fb741bb97a427a00ed3d0d63fb29d96f 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] 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) {
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
index 2db2dd26d..d79a7e242 100644
index 96f4edaa8..6855759ee 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -109,6 +109,15 @@ public class PurpurWorldConfig {
@@ -101,6 +101,15 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
}

10
patches/server/0037-Zombie-horse-naturally-spawn.patch → patches/server/0038-Zombie-horse-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 08672f6e86a74640abb8a9b29f440da692558a85 Mon Sep 17 00:00:00 2001
From 09696d5831ed23b189a48aa65ca0088888f14156 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] Zombie horse naturally spawn
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 093fa8074..7955a079b 100644
index 578cc6888..ee95ed6fa 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -622,12 +622,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1059,12 +1059,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {
@@ -38,10 +38,10 @@ index 093fa8074..7955a079b 100644
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
index d79a7e242..3dad7bded 100644
index 6855759ee..07f3296c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -124,4 +124,9 @@ public class PurpurWorldConfig {
@@ -116,4 +116,9 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
}

6
patches/server/0038-Charged-creeper-naturally-spawn.patch → patches/server/0039-Charged-creeper-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 4e0bfa3879efb2558a9e2139c4fd0f5554b59a45 Mon Sep 17 00:00:00 2001
From 95f4eaf182e502970e05b1cda5de1911ee283ce1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:37:44 -0600
Subject: [PATCH] Charged creeper naturally spawn
@@ -29,10 +29,10 @@ index 5e7f3af37..ec5287fa5 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3dad7bded..d9c4ffbe8 100644
index 07f3296c6..d8e72bd7c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -92,6 +92,11 @@ public class PurpurWorldConfig {
@@ -84,6 +84,11 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch → patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -1,4 +1,4 @@
From 65ded2f0ce2ede0d1b623971d998474e1b52c791 Mon Sep 17 00:00:00 2001
From a1a7daf8ae4503b74199ce17c1b7d9574de44ed7 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] Rabbit naturally spawn toast and killer
@@ -41,10 +41,10 @@ index 00c9233f8..1be0f943b 100644
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
index d9c4ffbe8..9e144a369 100644
index d8e72bd7c..4ac9c9db5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -123,6 +123,13 @@ public class PurpurWorldConfig {
@@ -115,6 +115,13 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
}

4
patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch → patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch
View File

@@ -1,4 +1,4 @@
From 25d12fdb337d2ee04701ad2142690107368c728f Mon Sep 17 00:00:00 2001
From 367816c82ec5388b8cbdd72dcf6912900e66cfb2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 4 Jun 2019 15:50:08 -0500
Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
index ee18dc3fa2..4532406c4e 100644
index 9beb6fad2..b98d09442 100644
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener {

6
patches/server/0041-Make-Iron-Golems-Swim.patch → patches/server/0042-Make-Iron-Golems-Swim.patch
View File

@@ -1,4 +1,4 @@
From a74080199c03418349b2f1857905c2349fce12c4 Mon Sep 17 00:00:00 2001
From 914df1970bc65b4f06588cb21d179f47ad654c5c 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 e38a675be..ab0731c2a 100644
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
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
index 9e144a369..c89d2221b 100644
index 4ac9c9db5..0eba948fd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -123,6 +123,11 @@ public class PurpurWorldConfig {
@@ -115,6 +115,11 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
}

8
patches/server/0042-Dont-send-useless-entity-packets.patch → patches/server/0043-Dont-send-useless-entity-packets.patch
View File

@@ -1,4 +1,4 @@
From 2e265fe093ff3fefc0579df66571791c61b4e0e4 Mon Sep 17 00:00:00 2001
From 0021421d337cbafb7fbc00cf55e838ce532b9cce Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 17:00:04 -0500
Subject: [PATCH] Dont send useless entity packets
@@ -10,10 +10,10 @@ Subject: [PATCH] Dont send useless entity packets
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index 10cae053b..509df9bab 100644
index e9bc546f8..c28e67f9b 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -177,6 +177,7 @@ public class EntityTrackerEntry {
@@ -178,6 +178,7 @@ public class EntityTrackerEntry {
this.o = 0;
packet1 = new PacketPlayOutEntityTeleport(this.tracker);
}
@@ -21,7 +21,7 @@ index 10cae053b..509df9bab 100644
}
if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
@@ -263,6 +264,22 @@ public class EntityTrackerEntry {
@@ -264,6 +265,22 @@ public class EntityTrackerEntry {
}

6
patches/server/0043-Tulips-change-fox-type.patch → patches/server/0044-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From d544c399255148396c6f85f93a1dc42826115de5 Mon Sep 17 00:00:00 2001
From 8b987119abc32fe686254fb78afd8e8902f5a961 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
@@ -90,10 +90,10 @@ index 619c40b27..b5305eaa9 100644
public static final Item bq = a(Blocks.OXEYE_DAISY, 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
index c89d2221b..8d620b4ef 100644
index 0eba948fd..007da617a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -97,6 +97,11 @@ public class PurpurWorldConfig {
@@ -89,6 +89,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

18
patches/server/0044-Breedable-Polar-Bears.patch → patches/server/0045-Breedable-Polar-Bears.patch
View File

@@ -1,12 +1,12 @@
From de732dfe84607cb98f4cda698738c786db24a793 Mon Sep 17 00:00:00 2001
From d322c81aad3685053fdb6229dcadb438808e8fdf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:46:44 -0500
Subject: [PATCH] Breedable Polar Bears
---
.../net/minecraft/server/EntityPolarBear.java | 34 ++++++++++++++++++-
.../net/pl3x/purpur/PurpurWorldConfig.java | 12 +++++++
2 files changed, 45 insertions(+), 1 deletion(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index 69e5c1aed..6506e0055 100644
@@ -73,21 +73,21 @@ index 69e5c1aed..6506e0055 100644
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
index 8d620b4ef..12e263d21 100644
index 007da617a..fe7201939 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,10 @@
@@ -1,5 +1,10 @@
package net.pl3x.purpur;
import com.destroystokyo.paper.PaperWorldConfig;
+import com.destroystokyo.paper.PaperWorldConfig;
+import net.minecraft.server.IRegistry;
+import net.minecraft.server.Item;
+import net.minecraft.server.Items;
+import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
import org.spigotmc.SpigotWorldConfig;
@@ -133,6 +137,14 @@ public class PurpurWorldConfig {
import java.util.List;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -125,6 +130,14 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

8
patches/server/0045-Chickens-can-retaliate.patch → patches/server/0046-Chickens-can-retaliate.patch
View File

@@ -1,4 +1,4 @@
From 141f81a229d60cfd704a429e83fddb8e9d594008 Mon Sep 17 00:00:00 2001
From 786ef853ee3b3e82b0d4dd5f045ed02ef70e19ca Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 12 Apr 2020 13:19:34 -0500
Subject: [PATCH] Chickens can retaliate
@@ -9,7 +9,7 @@ Subject: [PATCH] Chickens can retaliate
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index c6ee92343a..fa97552bb4 100644
index c6ee92343..fa97552bb 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -20,14 +20,33 @@ public class EntityChicken extends EntityAnimal {
@@ -57,10 +57,10 @@ index c6ee92343a..fa97552bb4 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 12e263d216..77cdd94d54 100644
index fe7201939..56657c357 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -96,6 +96,11 @@ public class PurpurWorldConfig {
@@ -89,6 +89,11 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

6
patches/server/0046-Add-option-to-set-armorstand-step-height.patch → patches/server/0047-Add-option-to-set-armorstand-step-height.patch
View File

@@ -1,4 +1,4 @@
From 400fc0a593ffa7945c7d199507bcddd2273666e0 Mon Sep 17 00:00:00 2001
From 8b35258b4e6dc36c81503d1a85d53cfae9625c6d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 6 Oct 2019 12:46:35 -0500
Subject: [PATCH] Add option to set armorstand step height
@@ -21,10 +21,10 @@ index 250bccee4..7543f2cee 100644
if (!this.canTick) {
if (this.noTickPoseDirty) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 77cdd94d5..d403450e2 100644
index 56657c357..90400b26f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -69,6 +69,11 @@ public class PurpurWorldConfig {
@@ -62,6 +62,11 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}

14
patches/server/0047-Cat-spawning-options.patch → patches/server/0048-Cat-spawning-options.patch
View File

@@ -1,4 +1,4 @@
From 55b3a3d0f209f9fed5b1973bb36c08b6534aaafc Mon Sep 17 00:00:00 2001
From da88862d2962b0393e49eff4976f1dfc94325589 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 18:52:55 -0600
Subject: [PATCH] Cat spawning options
@@ -13,7 +13,7 @@ Subject: [PATCH] Cat spawning options
6 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index d3ea51c27..c9a808e22 100644
index dfa8f3439..a3a073f9d 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -45,6 +45,7 @@ public interface IEntityAccess {
@@ -74,7 +74,7 @@ index 67c20747a..68d37121f 100644
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index 303f6b095..11d16842d 100644
index c1e149f20..acc30cb0d 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -45,6 +45,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -107,10 +107,10 @@ index 5bd3bcc2b..5f2bb140a 100644
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7955a079b..149a0ada4 100644
index ee95ed6fa..918a82d46 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1881,6 +1881,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2358,6 +2358,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}
@@ -119,10 +119,10 @@ index 7955a079b..149a0ada4 100644
return this.getChunkProvider().j();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d403450e2..ec490745b 100644
index 90400b26f..013f3ba4d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,6 +101,15 @@ public class PurpurWorldConfig {
@@ -94,6 +94,15 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
}

2
patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch → patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
View File

@@ -1,4 +1,4 @@
From 6cef8b3a0a207fe01ddf73117cc3770203e8c01c Mon Sep 17 00:00:00 2001
From 1f12359ab18d29323245a5cb22101c7faad3252f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 01:23:22 -0600
Subject: [PATCH] MC-147659 - Fix non black cats spawning in swamp huts

14
patches/server/0049-Cows-eat-mushrooms.patch → patches/server/0050-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 8fc20523d0a02bb4dfdf896059856706dc924463 Mon Sep 17 00:00:00 2001
From e90551499231668e3dc14b45361a0ded003c1ac1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
4 files changed, 77 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 846ebe876d..78b4d82620 100644
index 7ecf832c2..a6105d8c8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2561,6 +2561,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2748,6 +2748,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -23,7 +23,7 @@ index 846ebe876d..78b4d82620 100644
this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
}
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index 30ee6df6b4..d6baddb9d3 100644
index 30ee6df6b..d6baddb9d 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -116,7 +116,7 @@ index 30ee6df6b4..d6baddb9d3 100644
public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 03477c6e91..63cff85af9 100644
index 69901be8b..dd894c7ea 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@@ -129,10 +129,10 @@ index 03477c6e91..63cff85af9 100644
public float aJ;
public float aK;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ec490745b0..faddf7c4bc 100644
index 013f3ba4d..8f9aa5283 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,11 @@ public class PurpurWorldConfig {
@@ -108,6 +108,11 @@ public class PurpurWorldConfig {
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
}

2
patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch → patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

@@ -1,4 +1,4 @@
From bb7737a02a0e52a0c6fceadc31e30de3957cc147 Mon Sep 17 00:00:00 2001
From e97562ca51fbf4a9530a6d9c509e3cc58454bc78 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:53:16 -0500
Subject: [PATCH] Fix cow rotation when shearing mooshroom

6
patches/server/0051-Pigs-give-saddle-back.patch → patches/server/0052-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From e4a7d439a42b6139c1fe3308fdeaf1b5f8857b1a Mon Sep 17 00:00:00 2001
From e75f4e76cc42d4b69d3c800d8b1259233841c06b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 01:14:46 -0500
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
index faddf7c4b..84c025c4a 100644
index 8f9aa5283..cc41c67f8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -161,6 +161,11 @@ public class PurpurWorldConfig {
@@ -154,6 +154,11 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

6
patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch → patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch
View File

@@ -1,4 +1,4 @@
From 71ef94f480dde9459ce85b48fab104f511800038 Mon Sep 17 00:00:00 2001
From 1f28d401cdd3db016f37f70cef4f62c6faf3e491 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:58:44 -0500
Subject: [PATCH] Snowman drop and put back pumpkin
@@ -47,10 +47,10 @@ index 15b886d9b..dfe615814 100644
return EnumInteractionResult.PASS;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 84c025c4a..ce443f9d7 100644
index cc41c67f8..76eff6baa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -181,6 +181,13 @@ public class PurpurWorldConfig {
@@ -174,6 +174,13 @@ public class PurpurWorldConfig {
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
}

6
patches/server/0053-Ender-dragon-always-drop-egg.patch → patches/server/0054-Ender-dragon-always-drop-egg.patch
View File

@@ -1,4 +1,4 @@
From cd0557107ef93a0cebc2242260df1d5a841de62d Mon Sep 17 00:00:00 2001
From 0d58ae055ab7be9765224cee5fb13ecf470199aa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 7 Feb 2020 04:42:57 -0600
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
index ce443f9d7..c76b15bef 100644
index 76eff6baa..fc310302d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -125,6 +125,11 @@ public class PurpurWorldConfig {
@@ -118,6 +118,11 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}

6
patches/server/0054-Ender-dragon-always-drop-full-exp.patch → patches/server/0055-Ender-dragon-always-drop-full-exp.patch
View File

@@ -1,4 +1,4 @@
From f9a625ee7814a6561dbd3793117358008f98d1dd Mon Sep 17 00:00:00 2001
From 2ec5767d24c8ee49d75f5cc64a29880d301820e9 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 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
index c76b15bef..328a0b4fe 100644
index fc310302d..201e916d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -126,8 +126,10 @@ public class PurpurWorldConfig {
@@ -119,8 +119,10 @@ public class PurpurWorldConfig {
}
public boolean enderDragonAlwaysDropsEggBlock = false;

6
patches/server/0055-Signs-editable-on-right-click.patch → patches/server/0056-Signs-editable-on-right-click.patch
View File

@@ -1,4 +1,4 @@
From ee9e1bedb34e6afdc80e72d7a35ca24a9a5a1aab Mon Sep 17 00:00:00 2001
From c582a3d813ffc01bd8eb7ebe3be1778483e0e9a6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 24 May 2019 02:39:25 -0500
Subject: [PATCH] Signs editable on right click
@@ -44,10 +44,10 @@ index c4b0d8720..e1ab29975 100644
// Paper start
//this.c = entityhuman;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 328a0b4fe..ed6102b40 100644
index 201e916d2..09a9e9b19 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -92,6 +92,11 @@ public class PurpurWorldConfig {
@@ -85,6 +85,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

16
patches/server/0056-Signs-allow-color-codes.patch → patches/server/0057-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 448a2ac9aa4422c108643494f19c1cdbe900ed3b Mon Sep 17 00:00:00 2001
From 5632a01348b52cfaf94abc740bdcfa58556a546f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -12,7 +12,7 @@ Subject: [PATCH] Signs allow color codes
5 files changed, 36 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 07f8f0fa7d..3556e86fd7 100644
index 07f8f0fa7..3556e86fd 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1269,6 +1269,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -24,7 +24,7 @@ index 07f8f0fa7d..3556e86fd7 100644
public int nextContainerCounter() { // CraftBukkit - void -> int
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index fd3e6cda6a..750896fc82 100644
index fd3e6cda6..750896fc8 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -344,6 +344,7 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
@@ -36,10 +36,10 @@ index fd3e6cda6a..750896fc82 100644
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e2c7ab7f04..be5b5b0573 100644
index 36519882f..c425578c1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2701,6 +2701,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2713,6 +2713,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end
@@ -55,7 +55,7 @@ index e2c7ab7f04..be5b5b0573 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index e1ab299756..1778c5474f 100644
index e1ab29975..1778c5474 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -1,6 +1,14 @@
@@ -96,10 +96,10 @@ index e1ab299756..1778c5474f 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index ed6102b407..5df442c5b8 100644
index 09a9e9b19..91dcfe1c6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -92,9 +92,12 @@ public class PurpurWorldConfig {
@@ -85,9 +85,12 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

6
patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch → patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -1,4 +1,4 @@
From fd7bdb9ad22a5333ebfd0c183c09964b952674e5 Mon Sep 17 00:00:00 2001
From 40297ce082b3571bcc64e7a1ad0f0605c9489b0c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 21 Jun 2019 14:37:10 -0500
Subject: [PATCH] Allow soil to moisten from water directly under it
@@ -40,10 +40,10 @@ index a315e2628..8dd48669c 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5df442c5b..c28c241ad 100644
index 91dcfe1c6..6f8604c5c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -92,6 +92,11 @@ public class PurpurWorldConfig {
@@ -85,6 +85,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

26
patches/server/0058-Controllable-Minecarts.patch → patches/server/0059-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 250f0664cec36bf8a6d9f0dde52344f3ff47ca2a Mon Sep 17 00:00:00 2001
From e0798fdcdf2c55cf2e17ea5efcc61f5c1adade7b 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
@@ -9,8 +9,8 @@ Subject: [PATCH] Controllable Minecarts
.../net/minecraft/server/EntityLiving.java | 6 +--
.../server/EntityMinecartAbstract.java | 38 +++++++++++++++++++
.../net/minecraft/server/ItemMinecart.java | 8 ++--
.../net/pl3x/purpur/PurpurWorldConfig.java | 30 +++++++++++++++
6 files changed, 83 insertions(+), 6 deletions(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 32 ++++++++++++++++
6 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 551ca4471..32757e231 100644
@@ -30,10 +30,10 @@ index 551ca4471..32757e231 100644
super(i, j, k);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 028f94a88..e72975ff6 100644
index a6105d8c8..5b3f287c8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1286,6 +1286,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1473,6 +1473,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}
@@ -42,7 +42,7 @@ index 028f94a88..e72975ff6 100644
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 63cff85af..cbfb62cd4 100644
index dd894c7ea..bf8be6012 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
@@ -139,10 +139,10 @@ index dc7decb06..0da16c200 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c28c241ad..d3d09d9a4 100644
index 6f8604c5c..64867b68d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,6 +1,8 @@
@@ -1,12 +1,18 @@
package net.pl3x.purpur;
import com.destroystokyo.paper.PaperWorldConfig;
@@ -151,17 +151,17 @@ index c28c241ad..d3d09d9a4 100644
import net.minecraft.server.IRegistry;
import net.minecraft.server.Item;
import net.minecraft.server.Items;
@@ -8,7 +10,9 @@ import net.minecraft.server.MinecraftKey;
import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
import org.spigotmc.SpigotWorldConfig;
+
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
import static net.pl3x.purpur.PurpurConfig.log;
@@ -74,6 +78,32 @@ public class PurpurWorldConfig {
public class PurpurWorldConfig {
@@ -67,6 +73,32 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}

8
patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch → patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -1,4 +1,4 @@
From 973be464795e3636e5b966303568ca44dc9d8858 Mon Sep 17 00:00:00 2001
From 99ca97484fbadcd23964ca8ac80a3a759639f411 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 3 Jul 2019 23:58:31 -0500
Subject: [PATCH] Disable loot drops on death by cramming
@@ -9,7 +9,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
2 files changed, 7 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index cbfb62cd4..f570f8955 100644
index bf8be6012..e42185ad4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity {
@@ -24,10 +24,10 @@ index cbfb62cd4..f570f8955 100644
deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper
} else {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d3d09d9a4..0e0f59c96 100644
index 64867b68d..579d5c9ff 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,11 @@ public class PurpurWorldConfig {
@@ -110,6 +110,11 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}

4
patches/server/0060-Players-should-not-cram-to-death.patch → patches/server/0061-Players-should-not-cram-to-death.patch
View File

@@ -1,4 +1,4 @@
From e5a6ecb6355378875b4a83f3976dbade4ffcb490 Mon Sep 17 00:00:00 2001
From 6c0156560acd0c292d202b385d0ca4abcf6e39fc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death
@@ -8,7 +8,7 @@ Subject: [PATCH] Players should not cram to death
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3556e86fd7..42f3ef1ee6 100644
index 3556e86fd..42f3ef1ee 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1243,7 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

6
patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch → patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -1,4 +1,4 @@
From b3e7d2a10bc7014139373f7f4d54b8469ecbc14b Mon Sep 17 00:00:00 2001
From 0e01fed709f7230ffaff6accc97538e2d7ce528e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 10 Jul 2019 20:43:05 -0500
Subject: [PATCH] Option to toggle milk curing bad omen
@@ -23,10 +23,10 @@ index fcf254bba..79554e18f 100644
return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0e0f59c96..b6bcbd1e6 100644
index 579d5c9ff..bdc6dc3e8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,8 +116,10 @@ public class PurpurWorldConfig {
@@ -111,8 +111,10 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

4
patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch → patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch
View File

@@ -1,4 +1,4 @@
From 2ed2dad2f015763bcf4bf54e56ebadece69521bb Mon Sep 17 00:00:00 2001
From 0f2c06bbaafea85a003d29915ddbaaa041ab1e87 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 18:33:05 -0500
Subject: [PATCH] End gateway should check if entity can use portal
@@ -8,7 +8,7 @@ Subject: [PATCH] End gateway should check if entity can use portal
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
index aebb6b6b2..c6b26f665 100644
index ce239d2b2..d00ca8a53 100644
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
@@ -122,6 +122,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick

2
patches/server/0063-Debug-stick-should-not-update-neighbors.patch → patches/server/0064-Debug-stick-should-not-update-neighbors.patch
View File

@@ -1,4 +1,4 @@
From e7b70b3784621d00d4579121864fa57f4e9c8b8a Mon Sep 17 00:00:00 2001
From cd0ac1a5de8b0c879b224d790f3cb8420bcdfca5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 17:16:30 -0500
Subject: [PATCH] Debug stick should not update neighbors

2
patches/server/0064-Fix-reloading-paper.yml.patch → patches/server/0065-Fix-reloading-paper.yml.patch
View File

@@ -1,4 +1,4 @@
From 123b61894938ade2049cf6b6c799bb0a670bdaa4 Mon Sep 17 00:00:00 2001
From feeb2ba03825354e6158d559a00dec7e5a446d67 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 19 Jun 2020 21:36:16 -0500
Subject: [PATCH] Fix reloading paper.yml

8
patches/server/0065-Fix-the-dead-lagging-the-server.patch → patches/server/0066-Fix-the-dead-lagging-the-server.patch
View File

@@ -1,4 +1,4 @@
From db4865d3be7d0d2ea790637854a9db73e7c98d42 Mon Sep 17 00:00:00 2001
From 2402604643ff2228ee0eef62a9d22558ccb17316 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 6 Mar 2020 13:37:26 -0600
Subject: [PATCH] Fix the dead lagging the server
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix the dead lagging the server
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3950842a8..5bedd61ee 100644
index 5b3f287c8..a8706f754 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1345,7 +1345,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1532,7 +1532,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
this.lastYaw = this.yaw;
this.lastPitch = this.pitch;
@@ -22,7 +22,7 @@ index 3950842a8..5bedd61ee 100644
public void c(Vec3D vec3d) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f570f8955..f86499c87 100644
index e42185ad4..5c4608b7e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2468,7 +2468,7 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0066-Skip-events-if-there-s-no-listeners.patch → patches/server/0067-Skip-events-if-there-s-no-listeners.patch
View File

@@ -1,4 +1,4 @@
From 8ded3a0a3455852f77e406fc37e2d54b150ccf1e Mon Sep 17 00:00:00 2001
From efbf1cafc98f7392be6f9486a83b9c836e51c57e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 03:07:59 -0500
Subject: [PATCH] Skip events if there's no listeners

2
patches/server/0067-Add-permission-for-F3-N-debug.patch → patches/server/0068-Add-permission-for-F3-N-debug.patch
View File

@@ -1,4 +1,4 @@
From 62ee2b84a56861dd16a6e684bffb679081cd8a06 Mon Sep 17 00:00:00 2001
From 81fa02e19fb81b0b604a26812e302aef25d2c139 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Dec 2019 04:21:54 -0600
Subject: [PATCH] Add permission for F3+N debug

6
patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch → patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch
View File

@@ -1,4 +1,4 @@
From fb4c424b01c1ae79cab705b551aa965039459b6c Mon Sep 17 00:00:00 2001
From 91b343ffcc7d5824106805315e6691a858bbb38d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 14 Jan 2020 19:43:40 -0600
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
index b6bcbd1e6..5549a984d 100644
index bdc6dc3e8..f60434669 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -252,6 +252,11 @@ public class PurpurWorldConfig {
@@ -247,6 +247,11 @@ public class PurpurWorldConfig {
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
}

4
patches/server/0069-Configurable-TPS-Catchup.patch → patches/server/0070-Configurable-TPS-Catchup.patch
View File

@@ -1,4 +1,4 @@
From ebcd9fce18fd418afbe8a58d9aa7a70f7c3d49b4 Mon Sep 17 00:00:00 2001
From 1175c64542b0d22dc132ca2f287b84621fea42d8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:06:22 -0500
Subject: [PATCH] Configurable TPS Catchup
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable TPS Catchup
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ae747377b..d052811a8 100644
index 8ed47fe05..5acd2a97c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1002,7 +1002,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

6
patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch → patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
View File

@@ -1,4 +1,4 @@
From 6db8e092f6a943b155e352555e804af2d89765a8 Mon Sep 17 00:00:00 2001
From 479f586644cf99b4591a1cc33409c3656696f3ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 19 Mar 2020 19:39:34 -0500
Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
@@ -22,10 +22,10 @@ index c68002ffe..9be919986 100644
if (b0 > 0 && !this.z()) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5549a984d..e571b3628 100644
index f60434669..11c4742c2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -117,9 +117,11 @@ public class PurpurWorldConfig {
@@ -112,9 +112,11 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean milkCuresBadOmen = true;

8
patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch → patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch
View File

@@ -1,4 +1,4 @@
From 11b683a401f03df22f26d56faf452f07e3b29f6b Mon Sep 17 00:00:00 2001
From ef199323d2ecd67ab3248c5089800c06c3d407f0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 26 Apr 2020 16:28:38 -0500
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
index e571b3628..bd9ac998f 100644
index 11c4742c2..f015c456f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -172,8 +172,10 @@ public class PurpurWorldConfig {
@@ -167,8 +167,10 @@ public class PurpurWorldConfig {
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
}
@@ -57,7 +57,7 @@ index e571b3628..bd9ac998f 100644
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -184,6 +186,11 @@ public class PurpurWorldConfig {
@@ -179,6 +181,11 @@ public class PurpurWorldConfig {
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
}

6
patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch → patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
View File

@@ -1,4 +1,4 @@
From f916325e8ddfdd78b0fb4f1e0613660cfc161bbf Mon Sep 17 00:00:00 2001
From af5088ad60fdfeb33bb27d80816504f300a7ae0d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Apr 2020 09:33:11 -0500
Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
@@ -22,10 +22,10 @@ index 93714e5d9..b23674625 100644
Iterator iterator = list.iterator();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index bd9ac998f..7217c07e5 100644
index f015c456f..3f1c33b5f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,10 +116,12 @@ public class PurpurWorldConfig {
@@ -111,10 +111,12 @@ public class PurpurWorldConfig {
}
public boolean disableDropsOnCrammingDeath = false;

6
patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch → patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 9aec3455d54c7df3b2f008deefa7ad8e4bfab3ed Mon Sep 17 00:00:00 2001
From cb4b26260622329c9395dc553eae15e1946ca124 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 24 Apr 2020 09:37:29 -0500
Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule
@@ -22,10 +22,10 @@ index 54a555509..0ff202c0d 100644
} else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7217c07e5..15dc4e222 100644
index 3f1c33b5f..cf9f33544 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -258,9 +258,11 @@ public class PurpurWorldConfig {
@@ -253,9 +253,11 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;

6
patches/server/0074-Villagers-follow-emerald-blocks.patch → patches/server/0075-Villagers-follow-emerald-blocks.patch
View File

@@ -1,4 +1,4 @@
From ffabf3305ff6809847d0cdf2d6d6f61bf6410d94 Mon Sep 17 00:00:00 2001
From 17b932a2f016412c95602271454572ea71b699d4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:10:12 -0600
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(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
index 15dc4e222..1f22ee61b 100644
index cf9f33544..4c2398313 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -259,10 +259,17 @@ public class PurpurWorldConfig {
@@ -254,10 +254,17 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFarmingBypassMobGriefing = false;

6
patches/server/0075-Allow-leashing-villagers.patch → patches/server/0076-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From df78ae333134e0b0076279dd1e27283b446974ba Mon Sep 17 00:00:00 2001
From 97c949e1962c25613f92616619f098d8bff6069d 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
@@ -57,10 +57,10 @@ index ab5e97e39..9985afb12 100644
@Override
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
index 1f22ee61b..f82288126 100644
index 4c2398313..98f88be8b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -258,17 +258,21 @@ public class PurpurWorldConfig {
@@ -253,17 +253,21 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;

6
patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch → patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -1,4 +1,4 @@
From 792d04191d5573257e7fba9a2f099e95c1de2455 Mon Sep 17 00:00:00 2001
From a1754a7a370e7b99ceb2a670042bd30bfc09e945 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 17:32:17 -0500
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) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f82288126..224f1e9a0 100644
index 98f88be8b..57f215572 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -261,12 +261,16 @@ public class PurpurWorldConfig {
@@ -256,12 +256,16 @@ public class PurpurWorldConfig {
public boolean villagerCanBeLeashed = false;
public boolean villagerFarmingBypassMobGriefing = false;
public boolean villagerFollowEmeraldBlock = false;

6
patches/server/0077-Implement-infinite-lava.patch → patches/server/0078-Implement-infinite-lava.patch
View File

@@ -1,4 +1,4 @@
From 1bd7b866f1033ae011212fba5ca8d0b08f5cd460 Mon Sep 17 00:00:00 2001
From ee1cbcdd7ed3523252131249f35cf1d9b92b081e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 23 Nov 2019 17:55:42 -0600
Subject: [PATCH] Implement infinite lava
@@ -55,10 +55,10 @@ index 29930e801..9e543449c 100644
protected boolean f() {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 224f1e9a0..01e5253e2 100644
index 57f215572..cbfeb352a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -138,6 +138,11 @@ public class PurpurWorldConfig {
@@ -133,6 +133,11 @@ public class PurpurWorldConfig {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
}

6
patches/server/0078-Make-lava-flow-speed-configurable.patch → patches/server/0079-Make-lava-flow-speed-configurable.patch
View File

@@ -1,4 +1,4 @@
From d644b319f649206fa33e833e2c1cd5879cc12c7a Mon Sep 17 00:00:00 2001
From ed3a4a07b4a0dfc0fef629ef7165d4d5d93787a7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 11:31:36 -0600
Subject: [PATCH] Make lava flow speed configurable
@@ -22,10 +22,10 @@ index 9e543449c..fb501a6c5 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 01e5253e2..a053ac84c 100644
index cbfeb352a..2ac578bda 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -139,8 +139,12 @@ public class PurpurWorldConfig {
@@ -134,8 +134,12 @@ public class PurpurWorldConfig {
}
public boolean lavaInfinite = false;

6
patches/server/0079-Add-player-death-exp-control-options.patch → patches/server/0080-Add-player-death-exp-control-options.patch
View File

@@ -1,4 +1,4 @@
From 8ef47fffdb2f3ef8a37da0cb8b565a8e9615a76c Mon Sep 17 00:00:00 2001
From c9f22b56871cccda18e36d7802be88fe7782a56e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 22:08:37 -0600
Subject: [PATCH] Add player death exp control options
@@ -44,10 +44,10 @@ index a69a69859..ea4144371 100644
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a053ac84c..54208a018 100644
index 2ac578bda..86b3cdcdc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -126,6 +126,13 @@ public class PurpurWorldConfig {
@@ -121,6 +121,13 @@ public class PurpurWorldConfig {
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
}

14
patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch → patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch
View File

@@ -1,4 +1,4 @@
From 7adbe0af58e15202ba8f2318eedccd53692984e6 Mon Sep 17 00:00:00 2001
From d0d2ae9b7bb99f89e9d17307354d00d8e4dc9426 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:07:08 -0600
Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -12,10 +12,10 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index ac58fcb79..0041027ec 100644
index 742c59cb0..2b2471072 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -467,6 +467,7 @@ public class ChunkRegionLoader {
@@ -475,6 +475,7 @@ public class ChunkRegionLoader {
while (iterator1.hasNext()) {
Entity entity = (Entity) iterator1.next();
@@ -24,10 +24,10 @@ index ac58fcb79..0041027ec 100644
// Paper start
if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 5bedd61ee..2037fb1e1 100644
index a8706f754..17c591b82 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -303,6 +303,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -311,6 +311,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.headHeight = this.getHeadHeight(EntityPose.STANDING, this.size);
}
@@ -81,10 +81,10 @@ index a961f5d5d..c5d788f22 100644
if (entity != null) {
this.shooter = entity.getUniqueID();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 54208a018..551d0ae31 100644
index 86b3cdcdc..571fb0d11 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,11 +118,13 @@ public class PurpurWorldConfig {
@@ -113,11 +113,13 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;

10
patches/server/0081-Configurable-void-damage-height.patch → patches/server/0082-Configurable-void-damage-height.patch
View File

@@ -1,4 +1,4 @@
From bac3a683e9956c339388e5ae5b926fbc550ef49a Mon Sep 17 00:00:00 2001
From 111b356fa5f54cb0fe72f479074d657cd7813aa3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 21:42:19 -0600
Subject: [PATCH] Configurable void damage height
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable void damage height
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2037fb1e1..656413254 100644
index 17c591b82..8f5151de8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -526,7 +526,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -534,7 +534,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Paper start
protected void performVoidDamage() {
@@ -22,10 +22,10 @@ index 2037fb1e1..656413254 100644
&& this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 551d0ae31..b51b00014 100644
index 571fb0d11..199e0b8fe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -120,12 +120,14 @@ public class PurpurWorldConfig {
@@ -115,12 +115,14 @@ public class PurpurWorldConfig {
public boolean milkCuresBadOmen = true;
public boolean saveProjectilesToDisk = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;

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

@@ -1,4 +1,4 @@
From 5f7046fc2452c524155f338f6fefa7fe48506ada Mon Sep 17 00:00:00 2001
From 9212d4fbac057fa0bbb70f786a4c10fd2e1c22f6 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 b66059836..00b89746f 100644
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.m();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b51b00014..b6fc0c04e 100644
index 199e0b8fe..006859cc1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -305,6 +305,11 @@ public class PurpurWorldConfig {
@@ -300,6 +300,11 @@ public class PurpurWorldConfig {
witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
}

6
patches/server/0083-Dispenser-curse-of-binding-protection.patch → patches/server/0084-Dispenser-curse-of-binding-protection.patch
View File

@@ -1,4 +1,4 @@
From b227fee4191c35e86ea54f3781c1dcf77fb41027 Mon Sep 17 00:00:00 2001
From d981fc197a4b22382002f37c6f251fee71984fae Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 25 Aug 2019 00:09:52 -0500
Subject: [PATCH] Dispenser curse of binding protection
@@ -49,10 +49,10 @@ index 885458d54..c7d67d729 100644
return this.b;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b6fc0c04e..3deb3b8e3 100644
index 006859cc1..4d0687146 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -144,6 +144,11 @@ public class PurpurWorldConfig {
@@ -139,6 +139,11 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

8
patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch → patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -1,4 +1,4 @@
From cc30d1a1a73f35e5eb72d8a6ce0e3709ac602f66 Mon Sep 17 00:00:00 2001
From 26dbc8b8d852967b41e5f9e18faeb1adfebbcaea Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 7 Sep 2019 22:47:59 -0500
Subject: [PATCH] Add option for boats to eject players on land
@@ -21,10 +21,10 @@ index 409e0ac0a..a20d6feb8 100644
} else {
return EntityBoat.EnumStatus.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3deb3b8e3..99235e56e 100644
index 4d0687146..b90777b55 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,7 @@ public class PurpurWorldConfig {
@@ -110,6 +110,7 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}
@@ -32,7 +32,7 @@ index 3deb3b8e3..99235e56e 100644
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean milkCuresBadOmen = true;
@@ -122,6 +123,7 @@ public class PurpurWorldConfig {
@@ -117,6 +118,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
private void miscGameplayMechanicsSettings() {

2
patches/server/0085-Add-obfhelpers-for-plugin-use.patch → patches/server/0086-Add-obfhelpers-for-plugin-use.patch
View File

@@ -1,4 +1,4 @@
From 269d558f5c6e572d3e4e96ecd3910a92b98d975d Mon Sep 17 00:00:00 2001
From f7725461d43a8dabef8e3455f1c11a9a323be4bb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 1 Jan 2020 20:12:39 -0600
Subject: [PATCH] Add obfhelpers for plugin use

8
patches/server/0086-Mending-mends-most-damages-equipment-first.patch → patches/server/0087-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From 72cdf58c8e3cb29c4963d77d10ddfac3ebb9d9c2 Mon Sep 17 00:00:00 2001
From a0a344e5fa7ecf22e47fd9b885af1c07d8de28d2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
@@ -87,10 +87,10 @@ index c2e57a976..51e70db21 100644
return this.tag == null ? 0 : this.tag.getInt("Damage");
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 99235e56e..abfa1d79b 100644
index b90777b55..5079bd0f6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -115,6 +115,7 @@ public class PurpurWorldConfig {
@@ -110,6 +110,7 @@ public class PurpurWorldConfig {
idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
}
@@ -98,7 +98,7 @@ index 99235e56e..abfa1d79b 100644
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
@@ -123,6 +124,7 @@ public class PurpurWorldConfig {
@@ -118,6 +119,7 @@ public class PurpurWorldConfig {
public double tridentLoyaltyVoidReturnHeight = 0.0D;
public double voidDamageHeight = -64.0D;
private void miscGameplayMechanicsSettings() {

6
patches/server/0087-Implement-bamboo-growth-settings.patch → patches/server/0088-Implement-bamboo-growth-settings.patch
View File

@@ -1,4 +1,4 @@
From 6f93a87b376c43f64fafd766f320df8ff60d4260 Mon Sep 17 00:00:00 2001
From 8177f00bda2be8ef2d8d5cbc6ce3f36fb79b2f2e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 20:57:29 -0500
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
index abfa1d79b..f21b01565 100644
index 5079bd0f6..6752119a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -148,6 +148,13 @@ public class PurpurWorldConfig {
@@ -143,6 +143,13 @@ public class PurpurWorldConfig {
playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack);
}

30
patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch → patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 46ca01a03fcc265bdc9bfa748cbc17a1082a0c97 Mon Sep 17 00:00:00 2001
From cfdff7f48317faf48b2672c813799cf269bac163 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -18,10 +18,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
11 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 656413254..2efb8a975 100644
index 8f5151de8..7a4cc7c30 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1525,6 +1525,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1712,6 +1712,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -87,19 +87,19 @@ index ee7a2fedd..c9ab80ccd 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f86499c87..bc9e2e0c7 100644
index 5c4608b7e..18a49e69a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2852,7 +2852,7 @@ public abstract class EntityLiving extends Entity {
return;
}
@@ -2854,7 +2854,7 @@ public abstract class EntityLiving extends Entity {
// Paper - end don't run getEntities if we're not going to use its result
- List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this));
+ List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.pushable(this, world.purpurConfig.fixClimbingBypassingCrammingRule)); // Purpur
// Tuinity start - reduce memory allocation from collideNearby
List<Entity> list = com.tuinity.tuinity.util.CachedLists.getTempGetEntitiesList();
- this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this), list);
+ this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.pushable(this, world.purpurConfig.fixClimbingBypassingCrammingRule), list);
try {
// Tuinity end - reduce memory allocation from collideNearby
if (!list.isEmpty()) {
// Paper - move up
@@ -2991,8 +2991,8 @@ public abstract class EntityLiving extends Entity {
@@ -2998,8 +2998,8 @@ public abstract class EntityLiving extends Entity {
}
@Override
@@ -177,10 +177,10 @@ index 9b4795f3b..192d9798c 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f21b01565..39163634c 100644
index 6752119a7..0b3a7e01c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -119,6 +119,7 @@ public class PurpurWorldConfig {
@@ -114,6 +114,7 @@ public class PurpurWorldConfig {
public boolean boatEjectPlayersOnLand = false;
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
@@ -188,7 +188,7 @@ index f21b01565..39163634c 100644
public boolean milkCuresBadOmen = true;
public boolean saveProjectilesToDisk = true;
public double tridentLoyaltyVoidReturnHeight = 0.0D;
@@ -128,6 +129,7 @@ public class PurpurWorldConfig {
@@ -123,6 +124,7 @@ public class PurpurWorldConfig {
boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);

8
patches/server/0089-Add-5-second-tps-average-in-tps.patch → patches/server/0090-Add-5-second-tps-average-in-tps.patch
View File

@@ -1,4 +1,4 @@
From f8672129e3f1be70b1b81222c01520ecb5a6eaaa Mon Sep 17 00:00:00 2001
From 17c9f3c75b390a40743295f7365d1fd2b7d9920b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 28 Jul 2019 01:27:37 -0500
Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d052811a8..46231e01d 100644
index 5acd2a97c..6c0854623 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -165,7 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,10 +52,10 @@ index d052811a8..46231e01d 100644
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1a6fa4059..044547786 100644
index a1130d169..fd87db422 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2162,6 +2162,7 @@ public final class CraftServer implements Server {
@@ -2167,6 +2167,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

28
patches/server/0090-Implement-elytra-settings.patch → patches/server/0091-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From 377ef9fe1e7908ea97333883ba00f761aa400dc5 Mon Sep 17 00:00:00 2001
From 85896f8b272bddb5fc7534f54b0a0bad07c1bd8f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 25 Jul 2019 18:07:37 -0500
Subject: [PATCH] Implement elytra settings
@@ -8,12 +8,11 @@ Subject: [PATCH] Implement elytra settings
.../java/net/minecraft/server/ItemFireworks.java | 8 ++++++++
src/main/java/net/minecraft/server/ItemStack.java | 8 +++++++-
src/main/java/net/minecraft/server/ItemTrident.java | 10 ++++++++++
src/main/java/net/minecraft/server/Vec3D.java | 2 ++
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++++++++
6 files changed, 50 insertions(+), 2 deletions(-)
5 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index bc9e2e0c7..ec0e31b27 100644
index 18a49e69a..d02d7f21c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2825,7 +2825,16 @@ public abstract class EntityLiving extends Entity {
@@ -100,28 +99,11 @@ index 32982bb47..a0e4d46ab 100644
entityhuman.h((double) f2, (double) f3, (double) f4);
entityhuman.r(20);
if (entityhuman.isOnGround()) {
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index 3048ba008..2a00569d4 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -109,10 +109,12 @@ public class Vec3D implements IPosition {
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
+ public double magnitude() { return f(); } // Purpur - OBFHELPER
public double f() {
return (double) MathHelper.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
}
+ public double magnitudeSquared() { return g(); } // Purpur - OBFHELPER
public double g() {
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 39163634c..3f49a6a0b 100644
index 0b3a7e01c..c1faba57f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -136,6 +136,19 @@ public class PurpurWorldConfig {
@@ -131,6 +131,19 @@ public class PurpurWorldConfig {
voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
}

14
patches/server/0091-Add-item-entity-options.patch → patches/server/0092-Add-item-entity-options.patch
View File

@@ -1,4 +1,4 @@
From 6699495e47994aba3b94784c943b9a3a99a67742 Mon Sep 17 00:00:00 2001
From c8e390ea174ce6c8d02d78badc44b1073de1a9ad Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Feb 2020 15:54:08 -0600
Subject: [PATCH] Add item entity options
@@ -10,10 +10,10 @@ Subject: [PATCH] Add item entity options
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2efb8a975..3e95af4ee 100644
index 7a4cc7c30..476ca65a4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1471,6 +1471,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
@@ -44,18 +44,18 @@ index a7860cb4d..77e970c30 100644
// CraftBukkit start
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
index 3f49a6a0b..b018bfe03 100644
index c1faba57f..b0eac3dc9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -10,6 +10,7 @@ import net.minecraft.server.MinecraftKey;
@@ -9,6 +9,7 @@ import net.minecraft.server.Items;
import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
import org.spigotmc.SpigotWorldConfig;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -104,6 +105,19 @@ public class PurpurWorldConfig {
@@ -99,6 +100,19 @@ public class PurpurWorldConfig {
}
}

2
patches/server/0092-Add-ping-command.patch → patches/server/0093-Add-ping-command.patch
View File

@@ -1,4 +1,4 @@
From 0f1675c1fdc97b547706065d14be2f74aa04677d Mon Sep 17 00:00:00 2001
From 0dc5a2febf37efa3a38cd08bbd4b37ca9da7d7ca Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 13 Mar 2020 22:29:10 -0500
Subject: [PATCH] Add /ping command

10
patches/server/0093-Configurable-jockey-options.patch → patches/server/0094-Configurable-jockey-options.patch
View File

@@ -1,4 +1,4 @@
From a849d8c181f2b69e71ed8cf8357082fea30b9b32 Mon Sep 17 00:00:00 2001
From 1a79c93d7b5429efd06aadad006fde39ad4e0aa1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 21:39:32 -0500
Subject: [PATCH] Configurable jockey options
@@ -202,10 +202,10 @@ index 9b920332b..68fca8a8d 100644
public void saveData(NBTTagCompound nbttagcompound) {
super.saveData(nbttagcompound);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b018bfe03..8ce344c2a 100644
index b0eac3dc9..982abc4f2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -246,6 +246,15 @@ public class PurpurWorldConfig {
@@ -241,6 +241,15 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
}
@@ -221,7 +221,7 @@ index b018bfe03..8ce344c2a 100644
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;
private void enderDragonSettings() {
@@ -280,6 +289,15 @@ public class PurpurWorldConfig {
@@ -275,6 +284,15 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
}
@@ -237,7 +237,7 @@ index b018bfe03..8ce344c2a 100644
public double illusionerMaxHealth = 32.0D;
public double illusionerMovementSpeed = 0.5D;
public double illusionerFollowRange = 18.0D;
@@ -351,12 +369,36 @@ public class PurpurWorldConfig {
@@ -346,12 +364,36 @@ public class PurpurWorldConfig {
}
public boolean zombieTargetTurtleEggs = true;

12
patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From 7f5d7e8cb23ae79cd833edb1c8e00dbd99b928aa Mon Sep 17 00:00:00 2001
From 12f7259837f77bc389ee0bb398ec707acaac4fc1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:26:06 -0500
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -24,10 +24,10 @@ index 6fe5678cf..bd0267ee4 100644
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3e95af4ee..a5d4ca51a 100644
index 476ca65a4..6f12615d3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1401,6 +1401,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1588,6 +1588,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return d3 * d3 + d4 * d4 + d5 * d5;
}
@@ -35,7 +35,7 @@ index 3e95af4ee..a5d4ca51a 100644
public double h(Entity entity) {
return this.d(entity.getPositionVector());
}
@@ -1928,8 +1929,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2115,8 +2116,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}
@@ -336,10 +336,10 @@ index 3cb78924d..ec09ec241 100644
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
index 8ce344c2a..080a53544 100644
index 982abc4f2..9d33db49e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -312,6 +312,15 @@ public class PurpurWorldConfig {
@@ -307,6 +307,15 @@ public class PurpurWorldConfig {
ironGolemCanSwim = getBoolean("mobs.iron_golem.can-swim", ironGolemCanSwim);
}

2
patches/server/0095-Convert-legacy-item-text.patch → patches/server/0096-Convert-legacy-item-text.patch
View File

@@ -1,4 +1,4 @@
From 4be77127264751572a421248622c5bd436b4bedf Mon Sep 17 00:00:00 2001
From fa486db80a9ffdc62e4397c12bbbfa34cc09a2c6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Mon, 29 Jun 2020 08:56:53 -0500
Subject: [PATCH] Convert legacy item text

6
patches/server/0096-Customizable-EnderDragon-Health.patch → patches/server/0097-Customizable-EnderDragon-Health.patch
View File

@@ -1,4 +1,4 @@
From 99298e332aac29a905f102a40356a783cee008f7 Mon Sep 17 00:00:00 2001
From ae1e8e2ff7b4ca7f2d78e21057b839d978b023cb Mon Sep 17 00:00:00 2001
From: Jason Bierque <bierquejason@gmail.com>
Date: Wed, 1 Jul 2020 22:36:06 +0200
Subject: [PATCH] Customizable EnderDragon Health
@@ -30,10 +30,10 @@ index 08fa5a975..e08e6014f 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 080a53544..4de6edd87 100644
index 9d33db49e..57bfa4a46 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -257,9 +257,11 @@ public class PurpurWorldConfig {
@@ -252,9 +252,11 @@ public class PurpurWorldConfig {
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;