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

Bringing back Tuinity! \o/

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-20 20:40:30 -05:00
parent f4816e7ec6
commit ed7b2022b7
167 changed files with 8135 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@@ -1,44 +1,44 @@
From 19e5fd3956dda602886362c82847b18cbd09c04d Mon Sep 17 00:00:00 2001
From e2ba591861d7dd7532a3a9e8669ce81dc81ef8d9 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 | 32 +++--
pom.xml | 34 ++++--
.../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(+), 14 deletions(-)
7 files changed, 144 insertions(+), 15 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index e4c63bb76c..d5709e670b 100644
index 66517f30f..097c736bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +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.15.2-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>
<properties>
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
@@ -18,16 +18,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,16 +17,16 @@
</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>
@@ -47,14 +47,14 @@ index e4c63bb76c..d5709e670b 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>
<scope>compile</scope>
</dependency>
@@ -43,6 +43,20 @@
@@ -42,6 +42,20 @@
<version>${minecraft.version}-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -75,26 +75,27 @@ index e4c63bb76c..d5709e670b 100644
<dependency>
<groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId>
@@ -164,7 +178,7 @@
@@ -163,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 +186,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>
<executions>
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index cd6e259239..bb227bc0fb 100644
index 74ed02fa9..c1280478e 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -103,25 +104,25 @@ index cd6e259239..bb227bc0fb 100644
return super.buildReader(builder
- .appName("Paper")
+ .appName("Purpur") // Purpur
.variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history"))
.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 4ab6579032..1da54dba9f 100644
index 3c9392077..28d92cbce 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1570,7 +1570,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1630,7 +1630,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
- return "Paper"; //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Purpur"; // Purpur - Purpur > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
- return "Tuinity"; // Tuinity //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Purpur"; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
}
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
new file mode 100644
index 0000000000..d8b408f061
index 000000000..d8b408f06
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
@@ -0,0 +1,115 @@
@@ -241,20 +242,20 @@ index 0000000000..d8b408f061
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 568aefdf69..5496f8edee 100644
index 760752eae..2a6fd01d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -205,7 +205,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"; // Purpur // Paper
- 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");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 004b6ce132..e1cfde4ffc 100644
index 004b6ce13..e1cfde4ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -312,7 +312,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -267,14 +268,14 @@ index 004b6ce132..e1cfde4ffc 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 674096cab1..e9aee2d8a9 100644
index 001b1e519..e9aee2d8a 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/com.tuinity/tuinity-api/pom.properties"); // Tuinity
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.pl3x.purpur/purpur-api/pom.properties"); // Purpur
Properties properties = new Properties();

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

@@ -1,4 +1,4 @@
From 3dbfa3127eb3282ea182166ac575910d736727c1 Mon Sep 17 00:00:00 2001
From ac0db702eab4e6197bb37c8e84a81b410eae71ba 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
@@ -18,7 +18,7 @@ Subject: [PATCH] Purpur config files
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 24641501ae..b767dd1d04 100644
index 24641501a..b767dd1d0 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 {
@@ -42,7 +42,7 @@ index 24641501ae..b767dd1d04 100644
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 b07c49f1b4..cf5abd393e 100644
index 1f1243ae8..3190c709a 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -192,6 +192,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -60,9 +60,9 @@ index b07c49f1b4..cf5abd393e 100644
+ // Purpur end
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
// Paper end
com.tuinity.tuinity.config.TuinityConfig.init((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 032b7acee8..fb584091af 100644
index 6ae9ec627..bdb12d16f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -73,17 +73,17 @@ index 032b7acee8..fb584091af 100644
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
@@ -136,6 +137,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -138,6 +139,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
protected World(WorldData worlddata, DimensionManager dimensionmanager, java.util.concurrent.Executor executor, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) { // Paper - executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
+ this.purpurConfig = new net.pl3x.purpur.PurpurWorldConfig(worlddata.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(worlddata.getName()); // Tuinity - Server Config
this.generator = gen;
if (dimensionmanager.world == null) dimensionmanager.world = (WorldServer) this; // Paper
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 0000000000..333c880bf2
index 000000000..333c880bf
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -219,7 +219,7 @@ index 0000000000..333c880bf2
+}
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 0000000000..eda37fa43f
index 000000000..eda37fa43
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,67 @@
@@ -292,7 +292,7 @@ index 0000000000..eda37fa43f
+}
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 0000000000..7d983d9a54
index 000000000..7d983d9a5
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
@@ -0,0 +1,67 @@
@@ -364,26 +364,26 @@ index 0000000000..7d983d9a54
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5496f8edee..2293a5dd8d 100644
index 2a6fd01d6..e3a012800 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -815,6 +815,7 @@ public final class CraftServer implements Server {
@@ -816,6 +816,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.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -843,6 +844,7 @@ public final class CraftServer implements Server {
}
@@ -845,6 +846,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
@@ -861,6 +863,7 @@ public final class CraftServer implements Server {
@@ -863,6 +865,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -391,9 +391,9 @@ index 5496f8edee..2293a5dd8d 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2134,6 +2137,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
@@ -2147,6 +2150,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report
+ // Purpur start
+ @Override
@@ -411,12 +411,12 @@ index 5496f8edee..2293a5dd8d 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 d6e5d014c0..17ebc84f51 100644
index 90a2f8fea..8d436d275 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")

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

@@ -1,34 +1,36 @@
From 26fc01169441ddf5a7a5b4499be5c26350db652a Mon Sep 17 00:00:00 2001
From 8f0c3e0dbe590e8d7fd6e810a1a69e7c3959ce6c 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 a3b41ce5fc..df14bbaabd 100644
index b09981e9b..3342201b3 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)),
+ 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 a3b41ce5fc..df14bbaabd 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 {
@@ -58,5 +60,5 @@ index a3b41ce5fc..df14bbaabd 100644
String hostName = "BrokenHost";
try {
--
2.24.0
2.26.2

180
patches/server/0004-decompile-fixes.patch → patches/server/0005-decompile-fixes.patch
View File

@@ -1,4 +1,4 @@
From 809dfebb0fe424318cf3d7efc6cf646d3edcd347 Mon Sep 17 00:00:00 2001
From 1bcefd743dbd60759181f1ee12aa4a4526102698 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 13:39:06 -0600
Subject: [PATCH] decompile-fixes
@@ -95,7 +95,7 @@ Subject: [PATCH] decompile-fixes
88 files changed, 227 insertions(+), 233 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
index de831ed87e..9c38f8907a 100644
index de831ed87..9c38f8907 100644
--- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java
+++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
@@ -4,9 +4,9 @@ public class BiomeBambooJungle extends BiomeBase {
@@ -112,7 +112,7 @@ index de831ed87e..9c38f8907a 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
index 5ae19373d6..2a6dafccdd 100644
index 5ae19373d..2a6dafccd 100644
--- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
@@ -4,9 +4,9 @@ public final class BiomeBambooJungleHills extends BiomeBase {
@@ -129,7 +129,7 @@ index 5ae19373d6..2a6dafccdd 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java
index 2627404141..f4e9345aeb 100644
index 262740414..f4e9345ae 100644
--- a/src/main/java/net/minecraft/server/BiomeBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeBeach.java
@@ -4,9 +4,9 @@ public final class BiomeBeach extends BiomeBase {
@@ -146,7 +146,7 @@ index 2627404141..f4e9345aeb 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
index a42098da5c..58c30f6523 100644
index a42098da5..58c30f652 100644
--- a/src/main/java/net/minecraft/server/BiomeBigHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
@@ -4,8 +4,8 @@ public final class BiomeBigHills extends BiomeBase {
@@ -161,7 +161,7 @@ index a42098da5c..58c30f6523 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
index 27fa238013..9437438c82 100644
index 27fa23801..9437438c8 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForest.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForest extends BiomeBase {
@@ -176,7 +176,7 @@ index 27fa238013..9437438c82 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
index 51b1d39f53..3e5c23d31e 100644
index 51b1d39f5..3e5c23d31 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForestHills extends BiomeBase {
@@ -191,7 +191,7 @@ index 51b1d39f53..3e5c23d31e 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
index b74f23cff6..d5eb5c91c4 100644
index b74f23cff..d5eb5c91c 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase {
@@ -206,7 +206,7 @@ index b74f23cff6..d5eb5c91c4 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
index 17fe3818dd..e805f9568e 100644
index 17fe3818d..e805f9568 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
@@ -4,8 +4,8 @@ public final class BiomeBirchForestMutated extends BiomeBase {
@@ -221,7 +221,7 @@ index 17fe3818dd..e805f9568e 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
index 2c230be98f..1b92f4567d 100644
index 2c230be98..1b92f4567 100644
--- a/src/main/java/net/minecraft/server/BiomeColdBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java
@@ -4,9 +4,9 @@ public final class BiomeColdBeach extends BiomeBase {
@@ -238,7 +238,7 @@ index 2c230be98f..1b92f4567d 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
index d96e820e07..b9a5cb63a4 100644
index d96e820e0..b9a5cb63a 100644
--- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
@@ -4,10 +4,10 @@ public class BiomeColdDeepOcean extends BiomeBase {
@@ -266,7 +266,7 @@ index d96e820e07..b9a5cb63a4 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
index c7ed2e134a..571c3d139d 100644
index c7ed2e134..571c3d139 100644
--- a/src/main/java/net/minecraft/server/BiomeColdOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java
@@ -4,9 +4,9 @@ public class BiomeColdOcean extends BiomeBase {
@@ -292,7 +292,7 @@ index c7ed2e134a..571c3d139d 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
index c766dedfa9..88400e77bf 100644
index c766dedfa..88400e77b 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
@@ -4,9 +4,9 @@ public final class BiomeColdTaiga extends BiomeBase {
@@ -309,7 +309,7 @@ index c766dedfa9..88400e77bf 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
index 187f11f584..8a8fc7dbd2 100644
index 187f11f58..8a8fc7dbd 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
@@ -4,8 +4,8 @@ public final class BiomeColdTaigaHills extends BiomeBase {
@@ -324,7 +324,7 @@ index 187f11f584..8a8fc7dbd2 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
index 97c56fb803..327e6847f0 100644
index 97c56fb80..327e6847f 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
@@ -4,8 +4,8 @@ public final class BiomeColdTaigaMutated extends BiomeBase {
@@ -339,7 +339,7 @@ index 97c56fb803..327e6847f0 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
index bea1293144..651d44cb37 100644
index bea129314..651d44cb3 100644
--- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
@@ -4,10 +4,10 @@ public final class BiomeDeepOcean extends BiomeBase {
@@ -367,7 +367,7 @@ index bea1293144..651d44cb37 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
index 7a8784f18a..257732dad7 100644
index 7a8784f18..257732dad 100644
--- a/src/main/java/net/minecraft/server/BiomeDesert.java
+++ b/src/main/java/net/minecraft/server/BiomeDesert.java
@@ -4,11 +4,11 @@ public final class BiomeDesert extends BiomeBase {
@@ -388,7 +388,7 @@ index 7a8784f18a..257732dad7 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.e(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
index 9f5e9abc41..3752fc4509 100644
index 9f5e9abc4..3752fc450 100644
--- a/src/main/java/net/minecraft/server/BiomeDesertHills.java
+++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java
@@ -4,9 +4,9 @@ public final class BiomeDesertHills extends BiomeBase {
@@ -405,7 +405,7 @@ index 9f5e9abc41..3752fc4509 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.e(this);
diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
index f79e438dc4..1a0b569322 100644
index f79e438dc..1a0b56932 100644
--- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
@@ -4,8 +4,8 @@ public final class BiomeDesertMutated extends BiomeBase {
@@ -420,7 +420,7 @@ index f79e438dc4..1a0b569322 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.e(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
index 58a6125289..8e19e06889 100644
index 58a612528..8e19e0688 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsEdge extends BiomeBase {
@@ -435,7 +435,7 @@ index 58a6125289..8e19e06889 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
index cd18533bb0..69d4880c74 100644
index cd18533bb..69d4880c7 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsMutated extends BiomeBase {
@@ -450,7 +450,7 @@ index cd18533bb0..69d4880c74 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
index 2c7f5940a4..7661d53161 100644
index 2c7f5940a..7661d5316 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase {
@@ -465,7 +465,7 @@ index 2c7f5940a4..7661d53161 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
index 6e33c23632..05418f8fa1 100644
index 6e33c2363..05418f8fa 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
@@ -4,8 +4,8 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase {
@@ -480,7 +480,7 @@ index 6e33c23632..05418f8fa1 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
index c6ac9506a7..1d3f624323 100644
index c6ac9506a..1d3f62432 100644
--- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java
+++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
@@ -6,18 +6,18 @@ public final class BiomeFlowerForest extends BiomeBase {
@@ -508,7 +508,7 @@ index c6ac9506a7..1d3f624323 100644
BiomeDecoratorGroups.Z(this);
BiomeDecoratorGroups.aa(this);
diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
index 570a1f66f3..e849b411c6 100644
index 570a1f66f..e849b411c 100644
--- a/src/main/java/net/minecraft/server/BiomeForest.java
+++ b/src/main/java/net/minecraft/server/BiomeForest.java
@@ -4,9 +4,9 @@ public final class BiomeForest extends BiomeBase {
@@ -525,7 +525,7 @@ index 570a1f66f3..e849b411c6 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
index 8179e1c603..f7dea38eb3 100644
index 8179e1c60..f7dea38eb 100644
--- a/src/main/java/net/minecraft/server/BiomeForestHills.java
+++ b/src/main/java/net/minecraft/server/BiomeForestHills.java
@@ -4,9 +4,9 @@ public final class BiomeForestHills extends BiomeBase {
@@ -542,7 +542,7 @@ index 8179e1c603..f7dea38eb3 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
index 852c4bd9ab..67d120bef2 100644
index 852c4bd9a..67d120bef 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
@@ -6,10 +6,10 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
@@ -561,7 +561,7 @@ index 852c4bd9ab..67d120bef2 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
index 3d649c6004..2772bc6dac 100644
index 3d649c600..2772bc6da 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
@@ -6,9 +6,9 @@ public final class BiomeFrozenOcean extends BiomeBase {
@@ -578,7 +578,7 @@ index 3d649c6004..2772bc6dac 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
index 915f20042b..4be53fc0f6 100644
index 915f20042..4be53fc0f 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
@@ -4,7 +4,7 @@ public final class BiomeFrozenRiver extends BiomeBase {
@@ -591,7 +591,7 @@ index 915f20042b..4be53fc0f6 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
index f9ca6b889a..888dfcd8d4 100644
index f9ca6b889..888dfcd8d 100644
--- a/src/main/java/net/minecraft/server/BiomeHell.java
+++ b/src/main/java/net/minecraft/server/BiomeHell.java
@@ -4,20 +4,20 @@ public final class BiomeHell extends BiomeBase {
@@ -629,7 +629,7 @@ index f9ca6b889a..888dfcd8d4 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ZOMBIE_PIGMAN, 100, 4, 4));
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.MAGMA_CUBE, 2, 4, 4));
diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
index d5033de8aa..ad9b4efe09 100644
index d5033de8a..ad9b4efe0 100644
--- a/src/main/java/net/minecraft/server/BiomeIceMountains.java
+++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java
@@ -4,8 +4,8 @@ public final class BiomeIceMountains extends BiomeBase {
@@ -644,7 +644,7 @@ index d5033de8aa..ad9b4efe09 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
index 054b0e0ab1..71606b0a71 100644
index 054b0e0ab..71606b0a7 100644
--- a/src/main/java/net/minecraft/server/BiomeIcePlains.java
+++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java
@@ -4,11 +4,11 @@ public final class BiomeIcePlains extends BiomeBase {
@@ -665,7 +665,7 @@ index 054b0e0ab1..71606b0a71 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
index 44c410f75c..984f94bb59 100644
index 44c410f75..984f94bb5 100644
--- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
+++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
@@ -4,14 +4,14 @@ public final class BiomeIcePlainsSpikes extends BiomeBase {
@@ -688,7 +688,7 @@ index 44c410f75c..984f94bb59 100644
BiomeDecoratorGroups.h(this);
BiomeDecoratorGroups.l(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
index 2f893ce918..95e5019968 100644
index 2f893ce91..95e501996 100644
--- a/src/main/java/net/minecraft/server/BiomeJungle.java
+++ b/src/main/java/net/minecraft/server/BiomeJungle.java
@@ -4,9 +4,9 @@ public final class BiomeJungle extends BiomeBase {
@@ -705,7 +705,7 @@ index 2f893ce918..95e5019968 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
index 4858617859..e624f9764f 100644
index 485861785..e624f9764 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
@@ -4,8 +4,8 @@ public final class BiomeJungleEdge extends BiomeBase {
@@ -720,7 +720,7 @@ index 4858617859..e624f9764f 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
index a957f6124b..1fe9c840a7 100644
index a957f6124..1fe9c840a 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
@@ -4,8 +4,8 @@ public final class BiomeJungleEdgeMutated extends BiomeBase {
@@ -735,7 +735,7 @@ index a957f6124b..1fe9c840a7 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
index 7b9bc967a9..e2970ab00e 100644
index 7b9bc967a..e2970ab00 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleHills.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java
@@ -4,9 +4,9 @@ public final class BiomeJungleHills extends BiomeBase {
@@ -752,7 +752,7 @@ index 7b9bc967a9..e2970ab00e 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
index 02246950d0..ffe6b4344e 100644
index 02246950d..ffe6b4344 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
@@ -4,8 +4,8 @@ public final class BiomeJungleMutated extends BiomeBase {
@@ -767,7 +767,7 @@ index 02246950d0..ffe6b4344e 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
index e6d4a2c397..b23c43305b 100644
index e6d4a2c39..b23c43305 100644
--- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
@@ -4,10 +4,10 @@ public class BiomeLukewarmDeepOcean extends BiomeBase {
@@ -786,7 +786,7 @@ index e6d4a2c397..b23c43305b 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
index f2dc5d1b5c..efcb11bbe8 100644
index f2dc5d1b5..efcb11bbe 100644
--- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
@@ -4,9 +4,9 @@ public class BiomeLukewarmOcean extends BiomeBase {
@@ -803,7 +803,7 @@ index f2dc5d1b5c..efcb11bbe8 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
index f6ec90c2d0..328e939a6f 100644
index f6ec90c2d..328e939a6 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
@@ -4,8 +4,8 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase {
@@ -818,7 +818,7 @@ index f6ec90c2d0..328e939a6f 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
index e9ad930d88..36bea710a0 100644
index e9ad930d8..36bea710a 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
@@ -4,8 +4,8 @@ public final class BiomeMegaTaiga extends BiomeBase {
@@ -833,7 +833,7 @@ index e9ad930d88..36bea710a0 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
index cdc182c229..22474d682a 100644
index cdc182c22..22474d682 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
@@ -4,8 +4,8 @@ public final class BiomeMegaTaigaHills extends BiomeBase {
@@ -848,7 +848,7 @@ index cdc182c229..22474d682a 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
index 95e602a95f..65d606d51c 100644
index 95e602a95..65d606d51 100644
--- a/src/main/java/net/minecraft/server/BiomeMesa.java
+++ b/src/main/java/net/minecraft/server/BiomeMesa.java
@@ -4,8 +4,8 @@ public final class BiomeMesa extends BiomeBase {
@@ -863,7 +863,7 @@ index 95e602a95f..65d606d51c 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
index 57ef10afb0..5ecec62f18 100644
index 57ef10afb..5ecec62f1 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
@@ -4,8 +4,8 @@ public final class BiomeMesaBryce extends BiomeBase {
@@ -878,7 +878,7 @@ index 57ef10afb0..5ecec62f18 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
index b9f81a044f..14d4bd312e 100644
index b9f81a044..14d4bd312 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlataeu extends BiomeBase {
@@ -893,7 +893,7 @@ index b9f81a044f..14d4bd312e 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
index 3ce8d3cef5..b5dab9d2aa 100644
index 3ce8d3cef..b5dab9d2a 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlataeuClear extends BiomeBase {
@@ -908,7 +908,7 @@ index 3ce8d3cef5..b5dab9d2aa 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
index 88b7b37467..d05cc38b5e 100644
index 88b7b3746..d05cc38b5 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase {
@@ -923,7 +923,7 @@ index 88b7b37467..d05cc38b5e 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
index 7254bcf3e5..21a77ee812 100644
index 7254bcf3e..21a77ee81 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
@@ -4,8 +4,8 @@ public final class BiomeMesaPlateauMutated extends BiomeBase {
@@ -938,7 +938,7 @@ index 7254bcf3e5..21a77ee812 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
index 58bc1f2343..0302efbdc7 100644
index 58bc1f234..0302efbdc 100644
--- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
+++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
@@ -4,8 +4,8 @@ public final class BiomeMushroomIslandShore extends BiomeBase {
@@ -953,7 +953,7 @@ index 58bc1f2343..0302efbdc7 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
index cb620014b7..51f92584b8 100644
index cb620014b..51f92584b 100644
--- a/src/main/java/net/minecraft/server/BiomeMushrooms.java
+++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java
@@ -4,8 +4,8 @@ public final class BiomeMushrooms extends BiomeBase {
@@ -968,7 +968,7 @@ index cb620014b7..51f92584b8 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
index fd7e991062..ad9628b2aa 100644
index fd7e99106..ad9628b2a 100644
--- a/src/main/java/net/minecraft/server/BiomeOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeOcean.java
@@ -4,9 +4,9 @@ public final class BiomeOcean extends BiomeBase {
@@ -994,7 +994,7 @@ index fd7e991062..ad9628b2aa 100644
BiomeDecoratorGroups.ah(this);
BiomeDecoratorGroups.ap(this);
diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
index efbb36d016..ff6090e3c1 100644
index efbb36d01..ff6090e3c 100644
--- a/src/main/java/net/minecraft/server/BiomePlains.java
+++ b/src/main/java/net/minecraft/server/BiomePlains.java
@@ -4,10 +4,10 @@ public final class BiomePlains extends BiomeBase {
@@ -1013,7 +1013,7 @@ index efbb36d016..ff6090e3c1 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
index 7804a4e329..a28222eb1d 100644
index 7804a4e32..a28222eb1 100644
--- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
@@ -4,8 +4,8 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase {
@@ -1028,7 +1028,7 @@ index 7804a4e329..a28222eb1d 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
index 6522c80214..b84b868b1a 100644
index 6522c8021..b84b868b1 100644
--- a/src/main/java/net/minecraft/server/BiomeRiver.java
+++ b/src/main/java/net/minecraft/server/BiomeRiver.java
@@ -4,7 +4,7 @@ public final class BiomeRiver extends BiomeBase {
@@ -1050,7 +1050,7 @@ index 6522c80214..b84b868b1a 100644
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 2, 1, 4));
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SALMON, 5, 1, 5));
diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
index 30d6802242..16bcf9bff0 100644
index 30d680224..16bcf9bff 100644
--- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java
+++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
@@ -6,14 +6,14 @@ public final class BiomeRoofedForest extends BiomeBase {
@@ -1073,7 +1073,7 @@ index 30d6802242..16bcf9bff0 100644
BiomeDecoratorGroups.g(this);
BiomeDecoratorGroups.h(this);
diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
index 5c9ab0864e..9fa84c87fa 100644
index 5c9ab0864..9fa84c87f 100644
--- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
@@ -6,14 +6,14 @@ public final class BiomeRoofedForestMutated extends BiomeBase {
@@ -1096,7 +1096,7 @@ index 5c9ab0864e..9fa84c87fa 100644
BiomeDecoratorGroups.g(this);
BiomeDecoratorGroups.h(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
index e023898b38..c12a890165 100644
index e023898b3..c12a89016 100644
--- a/src/main/java/net/minecraft/server/BiomeSavanna.java
+++ b/src/main/java/net/minecraft/server/BiomeSavanna.java
@@ -4,10 +4,10 @@ public final class BiomeSavanna extends BiomeBase {
@@ -1115,7 +1115,7 @@ index e023898b38..c12a890165 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
index 8a0da661fb..db8b20a6c7 100644
index 8a0da661f..db8b20a6c 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
@@ -4,8 +4,8 @@ public final class BiomeSavannaMutated extends BiomeBase {
@@ -1130,7 +1130,7 @@ index 8a0da661fb..db8b20a6c7 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
index 1d2a37a41e..2826c510d8 100644
index 1d2a37a41..2826c510d 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
@@ -4,8 +4,8 @@ public final class BiomeSavannaPlateau extends BiomeBase {
@@ -1145,7 +1145,7 @@ index 1d2a37a41e..2826c510d8 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
index 91e2b59037..e544a8f6b9 100644
index 91e2b5903..e544a8f6b 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
@@ -4,8 +4,8 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase {
@@ -1160,7 +1160,7 @@ index 91e2b59037..e544a8f6b9 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
index 501c36649e..34660f9f84 100644
index 501c36649..34660f9f8 100644
--- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
@@ -4,8 +4,8 @@ public final class BiomeStoneBeach extends BiomeBase {
@@ -1175,7 +1175,7 @@ index 501c36649e..34660f9f84 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
index 62c1cfaef9..8815c95900 100644
index 62c1cfaef..8815c9590 100644
--- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
+++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
@@ -4,21 +4,21 @@ public final class BiomeSunflowerPlains extends BiomeBase {
@@ -1206,7 +1206,7 @@ index 62c1cfaef9..8815c95900 100644
BiomeDecoratorGroups.ap(this);
this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
index 29e448f5ad..02584897e9 100644
index 29e448f5a..02584897e 100644
--- a/src/main/java/net/minecraft/server/BiomeSwamp.java
+++ b/src/main/java/net/minecraft/server/BiomeSwamp.java
@@ -4,8 +4,8 @@ public final class BiomeSwamp extends BiomeBase {
@@ -1230,7 +1230,7 @@ index 29e448f5ad..02584897e9 100644
BiomeDecoratorGroups.ap(this);
this.a(EnumCreatureType.CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SHEEP, 12, 4, 4));
diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
index 1352daa258..d85b01b956 100644
index 1352daa25..d85b01b95 100644
--- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
@@ -4,7 +4,7 @@ public final class BiomeSwamplandMutated extends BiomeBase {
@@ -1243,7 +1243,7 @@ index 1352daa258..d85b01b956 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
index 5cd569dcdd..ae6e6ca896 100644
index 5cd569dcd..ae6e6ca89 100644
--- a/src/main/java/net/minecraft/server/BiomeTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeTaiga.java
@@ -4,10 +4,10 @@ public final class BiomeTaiga extends BiomeBase {
@@ -1262,7 +1262,7 @@ index 5cd569dcdd..ae6e6ca896 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
index e182f04008..4e19fe5ae9 100644
index e182f0400..4e19fe5ae 100644
--- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
@@ -4,8 +4,8 @@ public final class BiomeTaigaHills extends BiomeBase {
@@ -1277,7 +1277,7 @@ index e182f04008..4e19fe5ae9 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
index 75d46c61dc..05e833ffed 100644
index 75d46c61d..05e833ffe 100644
--- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
@@ -4,8 +4,8 @@ public final class BiomeTaigaMutated extends BiomeBase {
@@ -1292,7 +1292,7 @@ index 75d46c61dc..05e833ffed 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
index 26fda2cf69..22e9789a36 100644
index 26fda2cf6..22e9789a3 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEnd.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java
@@ -6,7 +6,7 @@ public final class BiomeTheEnd extends BiomeBase {
@@ -1305,7 +1305,7 @@ index 26fda2cf69..22e9789a36 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
index c065128649..a26d56aa45 100644
index c06512864..a26d56aa4 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
@@ -4,7 +4,7 @@ public class BiomeTheEndFloatingIslands extends BiomeBase {
@@ -1318,7 +1318,7 @@ index c065128649..a26d56aa45 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
index 90e79b2918..e47add3e43 100644
index 90e79b291..e47add3e4 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
@@ -4,10 +4,10 @@ public class BiomeTheEndHighIsland extends BiomeBase {
@@ -1336,7 +1336,7 @@ index 90e79b2918..e47add3e43 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
index c7d5317cc0..ec92a84579 100644
index c7d5317cc..ec92a8457 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
@@ -4,7 +4,7 @@ public class BiomeTheEndMediumIsland extends BiomeBase {
@@ -1349,7 +1349,7 @@ index c7d5317cc0..ec92a84579 100644
this.a(EnumCreatureType.MONSTER, new BiomeBase.BiomeMeta(EntityTypes.ENDERMAN, 10, 4, 4));
}
diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
index 87fd7e1467..c9ba334535 100644
index 87fd7e146..c9ba33453 100644
--- a/src/main/java/net/minecraft/server/BiomeVoid.java
+++ b/src/main/java/net/minecraft/server/BiomeVoid.java
@@ -4,6 +4,6 @@ public final class BiomeVoid extends BiomeBase {
@@ -1361,7 +1361,7 @@ index 87fd7e1467..c9ba334535 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
index 3f8e18a2c7..11dc5f6374 100644
index 3f8e18a2c..11dc5f637 100644
--- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
@@ -4,10 +4,10 @@ public class BiomeWarmDeepOcean extends BiomeBase {
@@ -1380,7 +1380,7 @@ index 3f8e18a2c7..11dc5f6374 100644
BiomeDecoratorGroups.c(this);
BiomeDecoratorGroups.d(this);
diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
index dd7916c090..e4dc7d198c 100644
index dd7916c09..e4dc7d198 100644
--- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
@@ -6,9 +6,9 @@ public class BiomeWarmOcean extends BiomeBase {
@@ -1409,7 +1409,7 @@ index dd7916c090..e4dc7d198c 100644
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.SQUID, 10, 4, 4));
this.a(EnumCreatureType.WATER_CREATURE, new BiomeBase.BiomeMeta(EntityTypes.PUFFERFISH, 15, 1, 3));
diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
index d384e9578a..f0d72ea39d 100644
index d384e9578..f0d72ea39 100644
--- a/src/main/java/net/minecraft/server/CommandDebug.java
+++ b/src/main/java/net/minecraft/server/CommandDebug.java
@@ -25,7 +25,7 @@ public class CommandDebug {
@@ -1422,7 +1422,7 @@ index d384e9578a..f0d72ea39d 100644
public static void a(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> com_mojang_brigadier_commanddispatcher) {
com_mojang_brigadier_commanddispatcher.register((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) ((LiteralArgumentBuilder) CommandDispatcher.a("debug").requires((commandlistenerwrapper) -> {
diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
index 5b1d2c7f50..da6a3fa2c8 100644
index 5b1d2c7f5..da6a3fa2c 100644
--- a/src/main/java/net/minecraft/server/EntityBlaze.java
+++ b/src/main/java/net/minecraft/server/EntityBlaze.java
@@ -24,7 +24,7 @@ public class EntityBlaze extends EntityMonster {
@@ -1435,7 +1435,7 @@ index 5b1d2c7f50..da6a3fa2c8 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index 57af3835ee..b3bdc194ab 100644
index 57af3835e..b3bdc194a 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -16,7 +16,7 @@ public class EntityCat extends EntityTameableAnimal {
@@ -1448,7 +1448,7 @@ index 57af3835ee..b3bdc194ab 100644
hashmap.put(1, new MinecraftKey("textures/entity/cat/black.png"));
hashmap.put(2, new MinecraftKey("textures/entity/cat/red.png"));
diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
index c13abc7e07..7ebd7da1c5 100644
index c13abc7e0..7ebd7da1c 100644
--- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
@@ -21,7 +21,7 @@ public class EntityEnderSignal extends Entity {
@@ -1461,7 +1461,7 @@ index c13abc7e07..7ebd7da1c5 100644
}));
}
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index b34695f2d0..e4bd2796a4 100644
index b34695f2d..e4bd2796a 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -19,7 +19,7 @@ public class EntityEndermite extends EntityMonster {
@@ -1474,7 +1474,7 @@ index b34695f2d0..e4bd2796a4 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index 886268b09e..b030fe9577 100644
index 886268b09..b030fe957 100644
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -24,7 +24,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1487,7 +1487,7 @@ index 886268b09e..b030fe9577 100644
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index d332907b3b..b853fd0d9b 100644
index d332907b3..b853fd0d9 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -73,11 +73,7 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1504,7 +1504,7 @@ index d332907b3b..b853fd0d9b 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 1402087612..94e57a2d85 100644
index 140208761..94e57a2d8 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -20,8 +20,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -1519,7 +1519,7 @@ index 1402087612..94e57a2d85 100644
hashmap.put(EntityTypes.CAVE_SPIDER, SoundEffects.ENTITY_PARROT_IMITATE_SPIDER);
hashmap.put(EntityTypes.CREEPER, SoundEffects.ENTITY_PARROT_IMITATE_CREEPER);
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index bb46247f2f..f63528ca3e 100644
index bb46247f2..f63528ca3 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -18,7 +18,7 @@ import org.bukkit.inventory.InventoryView;
@@ -1543,7 +1543,7 @@ index bb46247f2f..f63528ca3e 100644
private PathfinderGoalEatTile bA;
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 7b6b1ad17b..1432d3f6bf 100644
index 7b6b1ad17..1432d3f6b 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -30,13 +30,13 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -1563,7 +1563,7 @@ index 7b6b1ad17b..1432d3f6bf 100644
this.targetSelector.a(3, this.bA);
}
diff --git a/src/main/java/net/minecraft/server/GeneratorAccess.java b/src/main/java/net/minecraft/server/GeneratorAccess.java
index 5648ba73c5..304190fdc4 100644
index 5648ba73c..304190fdc 100644
--- a/src/main/java/net/minecraft/server/GeneratorAccess.java
+++ b/src/main/java/net/minecraft/server/GeneratorAccess.java
@@ -49,7 +49,7 @@ public interface GeneratorAccess extends IEntityAccess, IWorldReader, VirtualLev
@@ -1576,7 +1576,7 @@ index 5648ba73c5..304190fdc4 100644
@Override default java.util.List<VoxelShape> getEntityCollisions(@Nullable Entity entity, AxisAlignedBB axisalignedbb, Set<Entity> set, boolean returnFast) {return IEntityAccess.super.getEntityCollisions(entity, axisalignedbb, set, returnFast); } // Paper
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
index 38b79b5b10..c4aa38ddf1 100644
index 38b79b5b1..c4aa38ddf 100644
--- a/src/main/java/net/minecraft/server/MathHelper.java
+++ b/src/main/java/net/minecraft/server/MathHelper.java
@@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@@ -1589,7 +1589,7 @@ index 38b79b5b10..c4aa38ddf1 100644
afloat[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
}
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
index de8f1874af..73402f2b5a 100644
index de8f1874a..73402f2b5 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
@@ -25,7 +25,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -1602,7 +1602,7 @@ index de8f1874af..73402f2b5a 100644
public WorldGenFeatureRandomChoiceConfigurationWeight<FC> a(float f) {
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
index 979f3517c0..5827b1ba1a 100644
index 979f3517c..5827b1ba1 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
@@ -58,6 +58,6 @@ public class WorldGenFeatureTreeBeehive extends WorldGenFeatureTree {
@@ -1614,5 +1614,5 @@ index 979f3517c0..5827b1ba1a 100644
}
}
--
2.24.0
2.26.2

10
patches/server/0005-Add-language-asset-purpur.lang.patch → patches/server/0006-Add-language-asset-purpur.lang.patch
View File

@@ -1,4 +1,4 @@
From 4be161e9039519fbd95e15f53f7f070aa0bb5068 Mon Sep 17 00:00:00 2001
From ab0e10ba00591acd8a7821ae0647943a21d24b39 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 13:17:09 -0500
Subject: [PATCH] Add language asset purpur.lang
@@ -12,7 +12,7 @@ Subject: [PATCH] Add language asset purpur.lang
create mode 100644 src/main/resources/purpur.lang
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4ed4ad6bc3..9437a06d82 100644
index 4ed4ad6bc..9437a06d8 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1577,6 +1577,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -24,7 +24,7 @@ index 4ed4ad6bc3..9437a06d82 100644
if (!future.isSuccess() && (chatmessagetype == ChatMessageType.GAME_INFO || chatmessagetype == ChatMessageType.SYSTEM)) {
boolean flag = true;
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
index 6012739331..75707adcd7 100644
index 601273933..75707adcd 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -15,18 +15,41 @@ import java.util.Map.Entry;
@@ -104,7 +104,7 @@ index 6012739331..75707adcd7 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
index 7d983d9a54..36260e0ec8 100644
index 7d983d9a5..36260e0ec 100644
--- a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
@@ -1,5 +1,6 @@
@@ -125,7 +125,7 @@ index 7d983d9a54..36260e0ec8 100644
for (WorldServer world : console.getWorlds()) {
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
new file mode 100644
index 0000000000..0967ef424b
index 000000000..0967ef424
--- /dev/null
+++ b/src/main/resources/purpur.lang
@@ -0,0 +1 @@

8
patches/server/0006-Fix-vanilla-command-permission-handler.patch → patches/server/0007-Fix-vanilla-command-permission-handler.patch
View File

@@ -1,4 +1,4 @@
From 98e87908d5f618cbd2c223f6315b9dd62f1baa7f Mon Sep 17 00:00:00 2001
From 630e9dc4596781fdc3a496147184301aac82dd31 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix vanilla command permission handler
2 files changed, 2 insertions(+)
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
index bd2802d362..5fa2a45c81 100644
index bd2802d36..5fa2a45c8 100644
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
@@ -34,6 +34,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
@@ -21,7 +21,7 @@ index bd2802d362..5fa2a45c81 100644
public void removeCommand(String name) {
children.remove(name);
diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
index f344614600..8d89e671eb 100644
index f34461460..8d89e671e 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
@@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
@@ -33,5 +33,5 @@ index f344614600..8d89e671eb 100644
}
--
2.24.0
2.26.2

6
patches/server/0007-Host-our-own-timings.patch → patches/server/0008-Host-our-own-timings.patch
View File

@@ -1,4 +1,4 @@
From be0d0fa48d1a6aad73e95083e4562505501d0ecb Mon Sep 17 00:00:00 2001
From fabde23890d8301331617afb56b2285ee9ec1765 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:38:34 -0600
Subject: [PATCH] Host our own timings
@@ -8,7 +8,7 @@ Subject: [PATCH] Host our own timings
1 file changed, 4 insertions(+)
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 333c880bf2..2673de8212 100644
index 333c880bf..2673de821 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -127,4 +127,8 @@ public class PurpurConfig {
@@ -21,5 +21,5 @@ index 333c880bf2..2673de8212 100644
+ }
}
--
2.24.0
2.26.2

250
patches/server/0008-Ridables.patch → patches/server/0009-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 88e8ee2a56a8905befcc383e7dfc05dada4eabbd Mon Sep 17 00:00:00 2001
From 11dc6191a681f05cf592ab662bc14e09966eddbb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -8,7 +8,7 @@ Subject: [PATCH] Ridables
.../server/ControllerLookDolphin.java | 4 +-
.../net/minecraft/server/ControllerMove.java | 6 +-
.../net/minecraft/server/DamageSource.java | 3 +
.../java/net/minecraft/server/Entity.java | 69 +-
.../java/net/minecraft/server/Entity.java | 68 +-
.../net/minecraft/server/EntityAgeable.java | 2 +-
.../java/net/minecraft/server/EntityBat.java | 58 ++
.../java/net/minecraft/server/EntityBee.java | 118 +++-
@@ -104,7 +104,7 @@ Subject: [PATCH] Ridables
.../PathfinderGoalHorseHasRider.java | 21 +
.../craftbukkit/entity/CraftEntity.java | 27 +
src/main/resources/purpur.lang | 4 +-
100 files changed, 3622 insertions(+), 211 deletions(-)
100 files changed, 3621 insertions(+), 211 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -116,10 +116,10 @@ Subject: [PATCH] Ridables
create mode 100644 src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 1a466e9295..203c8fe8c0 100644
index 688c5b1bd..b35bac0e2 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -104,6 +104,7 @@ public class AxisAlignedBB {
@@ -216,6 +216,7 @@ public class AxisAlignedBB {
return new AxisAlignedBB(d3, d4, d5, d6, d7, d8);
}
@@ -127,7 +127,7 @@ index 1a466e9295..203c8fe8c0 100644
public AxisAlignedBB a(Vec3D vec3d) {
return this.b(vec3d.x, vec3d.y, vec3d.z);
}
@@ -155,6 +156,7 @@ public class AxisAlignedBB {
@@ -267,6 +268,7 @@ public class AxisAlignedBB {
return new AxisAlignedBB(d3, d4, d5, d6, d7, d8);
}
@@ -136,7 +136,7 @@ index 1a466e9295..203c8fe8c0 100644
return this.grow(d0, d0, d0);
}
diff --git a/src/main/java/net/minecraft/server/ControllerLookDolphin.java b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
index 1d9ba04daa..2bade947ee 100644
index 1d9ba04da..2bade947e 100644
--- a/src/main/java/net/minecraft/server/ControllerLookDolphin.java
+++ b/src/main/java/net/minecraft/server/ControllerLookDolphin.java
@@ -1,6 +1,6 @@
@@ -157,7 +157,7 @@ index 1d9ba04daa..2bade947ee 100644
this.d = false;
this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
index a5c4cbb67f..efe6afde9b 100644
index a5c4cbb67..efe6afde9 100644
--- a/src/main/java/net/minecraft/server/ControllerMove.java
+++ b/src/main/java/net/minecraft/server/ControllerMove.java
@@ -6,9 +6,9 @@ public class ControllerMove {
@@ -174,7 +174,7 @@ index a5c4cbb67f..efe6afde9b 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
index 816d301f1c..f7344d3aec 100644
index 816d301f1..f7344d3ae 100644
--- a/src/main/java/net/minecraft/server/DamageSource.java
+++ b/src/main/java/net/minecraft/server/DamageSource.java
@@ -57,6 +57,7 @@ public class DamageSource {
@@ -199,7 +199,7 @@ index 816d301f1c..f7344d3aec 100644
this.C = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e0ab058bf9..1ef13ee78e 100644
index 37f854764..dc72ee435 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -224,8 +224,8 @@ index e0ab058bf9..1ef13ee78e 100644
public double E;
public double F;
public double G;
- public float H;
+ public float H; public float getStepHeight() { return H; } public void setStepHeight(float stepHeight) { this.H = stepHeight; } // Purpur - OBFHELPER
- public float H; public final float getStepHeight() { return this.H; } // Tuinity - OBFHELPER
+ public float H; public final float getStepHeight() { return this.H; } public void setStepHeight(float stepHeight) { this.H = stepHeight; } // Purpur // Tuinity - OBFHELPER
public boolean noclip;
public float J;
protected final Random random;
@@ -238,15 +238,7 @@ index e0ab058bf9..1ef13ee78e 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -874,6 +874,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return vec3d1;
}
+ public static double getHorizontalDistanceSqr(Vec3D vec3d) { return b(vec3d); } // Purpur - OBFHELPER
public static double b(Vec3D vec3d) {
return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
}
@@ -1201,6 +1202,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1387,6 +1387,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return flag;
}
@@ -254,7 +246,7 @@ index e0ab058bf9..1ef13ee78e 100644
private boolean l() {
return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
}
@@ -1214,8 +1216,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1400,8 +1401,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.isInWater() || this.isInRain() || this.l();
}
@@ -265,7 +257,7 @@ index e0ab058bf9..1ef13ee78e 100644
}
public boolean aA() {
@@ -1346,6 +1349,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1532,6 +1534,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.inLava;
}
@@ -273,7 +265,7 @@ index e0ab058bf9..1ef13ee78e 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2181,7 +2185,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2367,7 +2370,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -288,7 +280,7 @@ index e0ab058bf9..1ef13ee78e 100644
}
return true; // CraftBukkit
}
@@ -2216,6 +2226,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2402,6 +2411,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -301,7 +293,7 @@ index e0ab058bf9..1ef13ee78e 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2384,6 +2400,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2570,6 +2585,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -309,7 +301,7 @@ index e0ab058bf9..1ef13ee78e 100644
public boolean bt() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2602,6 +2619,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2788,6 +2804,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -317,7 +309,7 @@ index e0ab058bf9..1ef13ee78e 100644
public void l(float f) {}
public boolean bA() {
@@ -3465,4 +3483,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3657,4 +3674,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -362,7 +354,7 @@ index e0ab058bf9..1ef13ee78e 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
index 3d27f0964a..822316a65f 100644
index 3d27f0964..822316a65 100644
--- a/src/main/java/net/minecraft/server/EntityAgeable.java
+++ b/src/main/java/net/minecraft/server/EntityAgeable.java
@@ -86,7 +86,7 @@ public abstract class EntityAgeable extends EntityCreature {
@@ -375,7 +367,7 @@ index 3d27f0964a..822316a65f 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 34239160be..592408bac9 100644
index 34239160b..592408bac 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -14,9 +14,44 @@ public class EntityBat extends EntityAmbient {
@@ -466,7 +458,7 @@ index 34239160be..592408bac9 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
index dd1d246aeb..f0f83baac8 100644
index dd1d246ae..f0f83baac 100644
--- a/src/main/java/net/minecraft/server/EntityBee.java
+++ b/src/main/java/net/minecraft/server/EntityBee.java
@@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -647,7 +639,7 @@ index dd1d246aeb..f0f83baac8 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityBlaze.java b/src/main/java/net/minecraft/server/EntityBlaze.java
index da6a3fa2c8..d02130e0d1 100644
index da6a3fa2c..d02130e0d 100644
--- a/src/main/java/net/minecraft/server/EntityBlaze.java
+++ b/src/main/java/net/minecraft/server/EntityBlaze.java
@@ -10,6 +10,7 @@ public class EntityBlaze extends EntityMonster {
@@ -737,7 +729,7 @@ index da6a3fa2c8..d02130e0d1 100644
if (this.c <= 0) {
this.c = 100;
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index b3bdc194ab..8b9222d778 100644
index b3bdc194a..8b9222d77 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -42,6 +42,23 @@ public class EntityCat extends EntityTameableAnimal {
@@ -831,7 +823,7 @@ index b3bdc194ab..8b9222d778 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityCaveSpider.java b/src/main/java/net/minecraft/server/EntityCaveSpider.java
index 23ced2c7bb..5b86b36f6a 100644
index 23ced2c7b..5b86b36f6 100644
--- a/src/main/java/net/minecraft/server/EntityCaveSpider.java
+++ b/src/main/java/net/minecraft/server/EntityCaveSpider.java
@@ -8,6 +8,23 @@ public class EntityCaveSpider extends EntitySpider {
@@ -859,7 +851,7 @@ index 23ced2c7bb..5b86b36f6a 100644
protected void initAttributes() {
super.initAttributes();
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index 65795fc896..5505b7ee94 100644
index 65795fc89..5505b7ee9 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -17,9 +17,27 @@ public class EntityChicken extends EntityAnimal {
@@ -899,7 +891,7 @@ index 65795fc896..5505b7ee94 100644
this.forceDrops = true; // CraftBukkit
this.a((IMaterial) Items.EGG);
diff --git a/src/main/java/net/minecraft/server/EntityCod.java b/src/main/java/net/minecraft/server/EntityCod.java
index 1e3782122a..0153a821ee 100644
index 1e3782122..0153a821e 100644
--- a/src/main/java/net/minecraft/server/EntityCod.java
+++ b/src/main/java/net/minecraft/server/EntityCod.java
@@ -6,6 +6,23 @@ public class EntityCod extends EntityFishSchool {
@@ -927,7 +919,7 @@ index 1e3782122a..0153a821ee 100644
protected ItemStack l() {
return new ItemStack(Items.COD_BUCKET);
diff --git a/src/main/java/net/minecraft/server/EntityComplexPart.java b/src/main/java/net/minecraft/server/EntityComplexPart.java
index a0b35c8699..144e89f224 100644
index a0b35c869..144e89f22 100644
--- a/src/main/java/net/minecraft/server/EntityComplexPart.java
+++ b/src/main/java/net/minecraft/server/EntityComplexPart.java
@@ -47,4 +47,11 @@ public class EntityComplexPart extends Entity {
@@ -943,7 +935,7 @@ index a0b35c8699..144e89f224 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index 2c8bbf20ae..723a9fa1ee 100644
index 2c8bbf20a..723a9fa1e 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -11,9 +11,27 @@ public class EntityCow extends EntityAnimal {
@@ -975,7 +967,7 @@ index 2c8bbf20ae..723a9fa1ee 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.25D, RecipeItemStack.a(Items.WHEAT), false));
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 45dfc8104a..48fd8e716b 100644
index 45dfc8104..48fd8e716 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -23,16 +23,35 @@ public class EntityCreeper extends EntityMonster {
@@ -1091,7 +1083,7 @@ index 45dfc8104a..48fd8e716b 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index ce78586ea0..81570b37bb 100644
index ce78586ea..81570b37b 100644
--- a/src/main/java/net/minecraft/server/EntityDolphin.java
+++ b/src/main/java/net/minecraft/server/EntityDolphin.java
@@ -1,5 +1,12 @@
@@ -1242,7 +1234,7 @@ index ce78586ea0..81570b37bb 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
index 77885f67ff..63f5969b10 100644
index 77885f67f..63f5969b1 100644
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -19,6 +19,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -1305,7 +1297,7 @@ index 77885f67ff..63f5969b10 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index aecdaacfc7..ab1747198a 100644
index 7daebfdab..54b63395f 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -1452,7 +1444,7 @@ index aecdaacfc7..ab1747198a 100644
if (this.bN != null) {
this.bN.b(this);
}
@@ -951,7 +1026,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -953,7 +1028,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@Override
protected boolean n(Entity entity) {
@@ -1462,7 +1454,7 @@ index aecdaacfc7..ab1747198a 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index 212636dcb2..de30ce483f 100644
index 212636dcb..de30ce483 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -27,9 +27,27 @@ public class EntityEnderman extends EntityMonster {
@@ -1561,7 +1553,7 @@ index 212636dcb2..de30ce483f 100644
if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
// CraftBukkit start - Place event
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index e4bd2796a4..5eaf1920b2 100644
index e4bd2796a..5eaf1920b 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -12,13 +12,32 @@ public class EntityEndermite extends EntityMonster {
@@ -1598,7 +1590,7 @@ index e4bd2796a4..5eaf1920b2 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
}
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index b030fe9577..179a261296 100644
index b030fe957..179a26129 100644
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -12,10 +12,28 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -1663,7 +1655,7 @@ index b030fe9577..179a261296 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityFish.java b/src/main/java/net/minecraft/server/EntityFish.java
index b853fd0d9b..b8d786fad5 100644
index b853fd0d9..b8d786fad 100644
--- a/src/main/java/net/minecraft/server/EntityFish.java
+++ b/src/main/java/net/minecraft/server/EntityFish.java
@@ -72,9 +72,10 @@ public abstract class EntityFish extends EntityWaterAnimal {
@@ -1717,7 +1709,7 @@ index b853fd0d9b..b8d786fad5 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 82a32d5dbf..4f53090d3d 100644
index 82a32d5db..4f53090d3 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -55,6 +55,23 @@ public class EntityFox extends EntityAnimal {
@@ -1855,7 +1847,7 @@ index 82a32d5dbf..4f53090d3d 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityGhast.java b/src/main/java/net/minecraft/server/EntityGhast.java
index e1c2540d14..46841df718 100644
index e1c2540d1..46841df71 100644
--- a/src/main/java/net/minecraft/server/EntityGhast.java
+++ b/src/main/java/net/minecraft/server/EntityGhast.java
@@ -14,11 +14,47 @@ public class EntityGhast extends EntityFlying implements IMonster {
@@ -1938,7 +1930,7 @@ index e1c2540d14..46841df718 100644
if (this.j-- <= 0) {
this.j += this.i.getRandom().nextInt(5) + 2;
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index d9e5eaad12..ff8a41a539 100644
index d9e5eaad1..ff8a41a53 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -4,8 +4,33 @@ public class EntityGiantZombie extends EntityMonster {
@@ -1976,7 +1968,7 @@ index d9e5eaad12..ff8a41a539 100644
protected float b(EntityPose entitypose, EntitySize entitysize) {
return 10.440001F;
diff --git a/src/main/java/net/minecraft/server/EntityGuardian.java b/src/main/java/net/minecraft/server/EntityGuardian.java
index e69cb334fb..97040872bc 100644
index e69cb334f..97040872b 100644
--- a/src/main/java/net/minecraft/server/EntityGuardian.java
+++ b/src/main/java/net/minecraft/server/EntityGuardian.java
@@ -24,15 +24,39 @@ public class EntityGuardian extends EntityMonster {
@@ -2077,7 +2069,7 @@ index e69cb334fb..97040872bc 100644
Vec3D vec3d = new Vec3D(this.b - this.i.locX(), this.c - this.i.locY(), this.d - this.i.locZ());
double d0 = vec3d.f();
diff --git a/src/main/java/net/minecraft/server/EntityGuardianElder.java b/src/main/java/net/minecraft/server/EntityGuardianElder.java
index 7484bfeea0..f231340d90 100644
index 7484bfeea..f231340d9 100644
--- a/src/main/java/net/minecraft/server/EntityGuardianElder.java
+++ b/src/main/java/net/minecraft/server/EntityGuardianElder.java
@@ -16,6 +16,23 @@ public class EntityGuardianElder extends EntityGuardian {
@@ -2105,7 +2097,7 @@ index 7484bfeea0..f231340d90 100644
public void initAttributes() {
super.initAttributes();
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index a6fb4ba5b9..98b1e93759 100644
index a6fb4ba5b..98b1e9375 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -19,6 +19,13 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -2123,7 +2115,7 @@ index a6fb4ba5b9..98b1e93759 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index c56efe035a..f31cb05542 100644
index c56efe035..f31cb0554 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -38,12 +38,32 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -2169,7 +2161,7 @@ index c56efe035a..f31cb05542 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
index 9a52decdca..64d80081f7 100644
index 9a52decdc..64d80081f 100644
--- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
+++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
@@ -6,6 +6,13 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -2187,7 +2179,7 @@ index 9a52decdca..64d80081f7 100644
protected SoundEffect getSoundAmbient() {
super.getSoundAmbient();
diff --git a/src/main/java/net/minecraft/server/EntityHorseMule.java b/src/main/java/net/minecraft/server/EntityHorseMule.java
index 4dd4d91eba..a9f26efe66 100644
index 4dd4d91eb..a9f26efe6 100644
--- a/src/main/java/net/minecraft/server/EntityHorseMule.java
+++ b/src/main/java/net/minecraft/server/EntityHorseMule.java
@@ -6,6 +6,13 @@ public class EntityHorseMule extends EntityHorseChestedAbstract {
@@ -2205,7 +2197,7 @@ index 4dd4d91eba..a9f26efe66 100644
protected SoundEffect getSoundAmbient() {
super.getSoundAmbient();
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index 290cb9337c..7bf76e5a0b 100644
index 290cb9337..7bf76e5a0 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -12,6 +12,18 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -2246,7 +2238,7 @@ index 290cb9337c..7bf76e5a0b 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
index 5782a25ecd..c87fc523f1 100644
index 5782a25ec..c87fc523f 100644
--- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
+++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -8,6 +8,18 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -2276,7 +2268,7 @@ index 5782a25ecd..c87fc523f1 100644
+ protected void ez() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7df24be46e..27cfc6654e 100644
index 7df24be46..27cfc6654 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2303,7 +2295,7 @@ index 7df24be46e..27cfc6654e 100644
this.setSneaking(false);
} else {
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index 81b7cd06f2..3e6722cfce 100644
index 81b7cd06f..3e6722cfc 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -19,10 +19,28 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -2344,7 +2336,7 @@ index 81b7cd06f2..3e6722cfce 100644
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 5aca7a9131..cbbbc875be 100644
index 5aca7a913..cbbbc875b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2436,7 +2428,7 @@ index 5aca7a9131..cbbbc875be 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 7f6a567760..288a043fbd 100644
index 7f6a56776..288a043fb 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -17,8 +17,26 @@ public class EntityIronGolem extends EntityGolem {
@@ -2491,7 +2483,7 @@ index 7f6a567760..288a043fbd 100644
float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3fc2360a10..58aa2a9a3e 100644
index a245cfab6..14dc1318a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -75,7 +75,7 @@ public abstract class EntityLiving extends Entity {
@@ -2564,7 +2556,7 @@ index 3fc2360a10..58aa2a9a3e 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 193dbfc5f6..c5f87cbdd2 100644
index 193dbfc5f..c5f87cbdd 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -16,7 +16,46 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -2654,7 +2646,7 @@ index 193dbfc5f6..c5f87cbdd2 100644
return i == -1 ? null : EnumColor.fromColorIndex(i);
diff --git a/src/main/java/net/minecraft/server/EntityLlamaTrader.java b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
index 4cebd67e85..08c4ca3f36 100644
index 4cebd67e8..08c4ca3f3 100644
--- a/src/main/java/net/minecraft/server/EntityLlamaTrader.java
+++ b/src/main/java/net/minecraft/server/EntityLlamaTrader.java
@@ -11,6 +11,23 @@ public class EntityLlamaTrader extends EntityLlama {
@@ -2695,7 +2687,7 @@ index 4cebd67e85..08c4ca3f36 100644
@Override
public GroupDataEntity prepare(GeneratorAccess generatoraccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/EntityMagmaCube.java b/src/main/java/net/minecraft/server/EntityMagmaCube.java
index 1fdc248ba8..a5a36af217 100644
index 1fdc248ba..a5a36af21 100644
--- a/src/main/java/net/minecraft/server/EntityMagmaCube.java
+++ b/src/main/java/net/minecraft/server/EntityMagmaCube.java
@@ -8,6 +8,23 @@ public class EntityMagmaCube extends EntitySlime {
@@ -2723,7 +2715,7 @@ index 1fdc248ba8..a5a36af217 100644
protected void initAttributes() {
super.initAttributes();
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index 8b199971bd..53bc312870 100644
index 8b199971b..53bc31287 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -19,6 +19,23 @@ public class EntityMushroomCow extends EntityCow {
@@ -2751,7 +2743,7 @@ index 8b199971bd..53bc312870 100644
public float a(BlockPosition blockposition, IWorldReader iworldreader) {
return iworldreader.getType(blockposition.down()).getBlock() == Blocks.MYCELIUM ? 10.0F : iworldreader.w(blockposition) - 0.5F;
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index d9a7b8ac1e..8fdf348573 100644
index d9a7b8ac1..8fdf34857 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -16,6 +16,23 @@ public class EntityOcelot extends EntityAnimal {
@@ -2794,7 +2786,7 @@ index d9a7b8ac1e..8fdf348573 100644
this.targetSelector.a(1, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, false, false, EntityTurtle.bw));
}
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
index f50ed19080..87ed9a8ca0 100644
index f50ed1908..87ed9a8ca 100644
--- a/src/main/java/net/minecraft/server/EntityPanda.java
+++ b/src/main/java/net/minecraft/server/EntityPanda.java
@@ -46,6 +46,23 @@ public class EntityPanda extends EntityAnimal {
@@ -2940,7 +2932,7 @@ index f50ed19080..87ed9a8ca0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 94e57a2d85..7ba2f3a351 100644
index 94e57a2d8..7ba2f3a35 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -62,12 +62,83 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -3041,7 +3033,7 @@ index 94e57a2d85..7ba2f3a351 100644
this.goalSelector.a(2, this.goalSit);
this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 96b4912c48..777bc95eef 100644
index 96b4912c4..777bc95ee 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -22,6 +22,40 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -3228,7 +3220,7 @@ index 96b4912c48..777bc95eef 100644
EntityPhantom.this.yaw += 180.0F;
this.j = 0.1F;
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index 8d277566e9..e6a7f8ef37 100644
index 8d277566e..e6a7f8ef3 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -19,9 +19,27 @@ public class EntityPig extends EntityAnimal {
@@ -3299,7 +3291,7 @@ index 8d277566e9..e6a7f8ef37 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index 9dd028b558..fb9ef88ea3 100644
index 9dd028b55..fb9ef88ea 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -17,6 +17,23 @@ public class EntityPigZombie extends EntityZombie {
@@ -3327,7 +3319,7 @@ index 9dd028b558..fb9ef88ea3 100644
public void setLastDamager(@Nullable EntityLiving entityliving) {
super.setLastDamager(entityliving);
diff --git a/src/main/java/net/minecraft/server/EntityPillager.java b/src/main/java/net/minecraft/server/EntityPillager.java
index 0357c9da93..98a657cece 100644
index 0357c9da9..98a657cec 100644
--- a/src/main/java/net/minecraft/server/EntityPillager.java
+++ b/src/main/java/net/minecraft/server/EntityPillager.java
@@ -13,15 +13,34 @@ public class EntityPillager extends EntityIllagerAbstract implements ICrossbow,
@@ -3366,7 +3358,7 @@ index 0357c9da93..98a657cece 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 9437a06d82..4ecc89ac44 100644
index 9437a06d8..4ecc89ac4 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1308,6 +1308,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -3386,7 +3378,7 @@ index 9437a06d82..4ecc89ac44 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
index f8e29a02d3..0a3906bde0 100644
index f8e29a02d..0a3906bde 100644
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
+++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
@@ -17,6 +17,23 @@ public class EntityPolarBear extends EntityAnimal {
@@ -3478,7 +3470,7 @@ index f8e29a02d3..0a3906bde0 100644
public d() {
diff --git a/src/main/java/net/minecraft/server/EntityPufferFish.java b/src/main/java/net/minecraft/server/EntityPufferFish.java
index 98af9a2235..d0e3e251e1 100644
index 98af9a223..d0e3e251e 100644
--- a/src/main/java/net/minecraft/server/EntityPufferFish.java
+++ b/src/main/java/net/minecraft/server/EntityPufferFish.java
@@ -17,6 +17,23 @@ public class EntityPufferFish extends EntityFish {
@@ -3515,7 +3507,7 @@ index 98af9a2235..d0e3e251e1 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index 2ed2d0b6bb..9040ab1c54 100644
index 2ed2d0b6b..9040ab1c5 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -26,9 +26,27 @@ public class EntityRabbit extends EntityAnimal {
@@ -3670,7 +3662,7 @@ index 2ed2d0b6bb..9040ab1c54 100644
this.d = flag;
}
diff --git a/src/main/java/net/minecraft/server/EntityRavager.java b/src/main/java/net/minecraft/server/EntityRavager.java
index fd25ce1026..98d182a4ce 100644
index fd25ce102..98d182a4c 100644
--- a/src/main/java/net/minecraft/server/EntityRavager.java
+++ b/src/main/java/net/minecraft/server/EntityRavager.java
@@ -20,14 +20,33 @@ public class EntityRavager extends EntityRaider {
@@ -3708,7 +3700,7 @@ index fd25ce1026..98d182a4ce 100644
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
diff --git a/src/main/java/net/minecraft/server/EntitySalmon.java b/src/main/java/net/minecraft/server/EntitySalmon.java
index 6be29f3078..189515b0ff 100644
index 6be29f307..189515b0f 100644
--- a/src/main/java/net/minecraft/server/EntitySalmon.java
+++ b/src/main/java/net/minecraft/server/EntitySalmon.java
@@ -6,6 +6,23 @@ public class EntitySalmon extends EntityFishSchool {
@@ -3736,7 +3728,7 @@ index 6be29f3078..189515b0ff 100644
public int es() {
return 5;
diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
index f63528ca3e..43eefa46c2 100644
index f63528ca3..43eefa46c 100644
--- a/src/main/java/net/minecraft/server/EntitySheep.java
+++ b/src/main/java/net/minecraft/server/EntitySheep.java
@@ -55,10 +55,28 @@ public class EntitySheep extends EntityAnimal {
@@ -3769,7 +3761,7 @@ index f63528ca3e..43eefa46c2 100644
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.1D, RecipeItemStack.a(Items.WHEAT), false));
diff --git a/src/main/java/net/minecraft/server/EntityShulker.java b/src/main/java/net/minecraft/server/EntityShulker.java
index 0d2ceff6f2..46379588c1 100644
index 0d2ceff6f..46379588c 100644
--- a/src/main/java/net/minecraft/server/EntityShulker.java
+++ b/src/main/java/net/minecraft/server/EntityShulker.java
@@ -32,6 +32,23 @@ public class EntityShulker extends EntityGolem implements IMonster {
@@ -3819,7 +3811,7 @@ index 0d2ceff6f2..46379588c1 100644
@Override
public boolean a() {
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index 08c2a22f7a..dff20567b3 100644
index 08c2a22f7..dff20567b 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -11,13 +11,32 @@ public class EntitySilverfish extends EntityMonster {
@@ -3864,7 +3856,7 @@ index 08c2a22f7a..dff20567b3 100644
public void g() {
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java
index 0e78d5c62c..8e6efeb7b7 100644
index 0e78d5c62..8e6efeb7b 100644
--- a/src/main/java/net/minecraft/server/EntitySkeleton.java
+++ b/src/main/java/net/minecraft/server/EntitySkeleton.java
@@ -6,6 +6,23 @@ public class EntitySkeleton extends EntitySkeletonAbstract {
@@ -3892,7 +3884,7 @@ index 0e78d5c62c..8e6efeb7b7 100644
protected SoundEffect getSoundAmbient() {
return SoundEffects.ENTITY_SKELETON_AMBIENT;
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
index 3c95c0428b..8bc4e85156 100644
index 3c95c0428..8bc4e8515 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java
@@ -28,12 +28,14 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR
@@ -3911,7 +3903,7 @@ index 3c95c0428b..8bc4e85156 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonStray.java b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
index 2eb53864f2..a930fb8401 100644
index 2eb53864f..a930fb840 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonStray.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonStray.java
@@ -8,6 +8,23 @@ public class EntitySkeletonStray extends EntitySkeletonAbstract {
@@ -3939,7 +3931,7 @@ index 2eb53864f2..a930fb8401 100644
return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
}
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
index 98e042424c..8aa0a6699f 100644
index 98e042424..8aa0a6699 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
@@ -9,6 +9,23 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -3967,7 +3959,7 @@ index 98e042424c..8aa0a6699f 100644
protected SoundEffect getSoundAmbient() {
return SoundEffects.ENTITY_WITHER_SKELETON_AMBIENT;
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index 2efc18df94..1469e3b23c 100644
index 2efc18df9..1469e3b23 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -32,12 +32,31 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -4044,7 +4036,7 @@ index 2efc18df94..1469e3b23c 100644
} else {
this.h = ControllerMove.Operation.WAIT;
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index dee55c5dea..65d7468997 100644
index dee55c5de..65d746899 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -13,12 +13,31 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -4106,7 +4098,7 @@ index dee55c5dea..65d7468997 100644
}
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
index d02db56595..d3708a7b0e 100644
index d02db5659..d3708a7b0 100644
--- a/src/main/java/net/minecraft/server/EntitySpider.java
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
@@ -11,14 +11,33 @@ public class EntitySpider extends EntityMonster {
@@ -4144,7 +4136,7 @@ index d02db56595..d3708a7b0e 100644
this.targetSelector.a(2, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityHuman.class));
this.targetSelector.a(3, new EntitySpider.PathfinderGoalSpiderNearestAttackableTarget<>(this, EntityIronGolem.class));
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index 92efe4e7f5..b967135ac3 100644
index 92efe4e7f..b967135ac 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -25,10 +25,28 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -4253,7 +4245,7 @@ index 92efe4e7f5..b967135ac3 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
index 9b2eea71cc..d55c6cb339 100644
index 9b2eea71c..d55c6cb33 100644
--- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
+++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
@@ -135,6 +135,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -4265,7 +4257,7 @@ index 9b2eea71cc..d55c6cb339 100644
return entityliving == this.getOwner();
}
diff --git a/src/main/java/net/minecraft/server/EntityTropicalFish.java b/src/main/java/net/minecraft/server/EntityTropicalFish.java
index ef8f373bea..992978463d 100644
index ef8f373be..992978463 100644
--- a/src/main/java/net/minecraft/server/EntityTropicalFish.java
+++ b/src/main/java/net/minecraft/server/EntityTropicalFish.java
@@ -19,6 +19,23 @@ public class EntityTropicalFish extends EntityFishSchool {
@@ -4293,7 +4285,7 @@ index ef8f373bea..992978463d 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
index b24a5100b4..4695492068 100644
index b24a5100b..469549206 100644
--- a/src/main/java/net/minecraft/server/EntityTurtle.java
+++ b/src/main/java/net/minecraft/server/EntityTurtle.java
@@ -27,6 +27,23 @@ public class EntityTurtle extends EntityAnimal {
@@ -4441,7 +4433,7 @@ index b24a5100b4..4695492068 100644
if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) {
double d0 = this.b - this.i.locX();
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 0f04bcc8b7..5a7494947c 100644
index 0f04bcc8b..5a7494947 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -259,6 +259,12 @@ public class EntityTypes<T extends Entity> {
@@ -4458,7 +4450,7 @@ index 0f04bcc8b7..5a7494947c 100644
if (this.bg == null) {
this.bg = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
index cf274666c7..d919f44ab8 100644
index cf274666c..d919f44ab 100644
--- a/src/main/java/net/minecraft/server/EntityVex.java
+++ b/src/main/java/net/minecraft/server/EntityVex.java
@@ -19,6 +19,50 @@ public class EntityVex extends EntityMonster {
@@ -4572,7 +4564,7 @@ index cf274666c7..d919f44ab8 100644
Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ());
double d0 = vec3d.f();
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 7da267d287..5b0de0d9d8 100644
index 7da267d28..5b0de0d9d 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -68,6 +68,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -4605,7 +4597,7 @@ index 7da267d287..5b0de0d9d8 100644
public BehaviorController<EntityVillager> getBehaviorController() {
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
index 2ad8dba5c0..4e9c5e84a9 100644
index 2ad8dba5c..4e9c5e84a 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -20,6 +20,23 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -4641,7 +4633,7 @@ index 2ad8dba5c0..4e9c5e84a9 100644
this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityZombie.class, 8.0F, 0.5D, 0.5D));
this.goalSelector.a(1, new PathfinderGoalAvoidTarget<>(this, EntityEvoker.class, 12.0F, 0.5D, 0.5D));
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
index c974c02e92..6ba920134a 100644
index c974c02e9..6ba920134 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
+++ b/src/main/java/net/minecraft/server/EntityVindicator.java
@@ -17,14 +17,33 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -4679,7 +4671,7 @@ index c974c02e92..6ba920134a 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
index 1432d3f6bf..447387bd78 100644
index 1432d3f6b..447387bd7 100644
--- a/src/main/java/net/minecraft/server/EntityWitch.java
+++ b/src/main/java/net/minecraft/server/EntityWitch.java
@@ -24,6 +24,23 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -4722,7 +4714,7 @@ index 1432d3f6bf..447387bd78 100644
this.targetSelector.a(2, this.bz);
this.targetSelector.a(3, this.bA);
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 2f466af4d5..8c1fa37178 100644
index 2f466af4d..8c1fa3717 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -18,7 +18,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4855,7 +4847,7 @@ index 2f466af4d5..8c1fa37178 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index eec1e26b6e..47f0b2df6c 100644
index eec1e26b6..47f0b2df6 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java
+++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -30,10 +30,28 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -5029,7 +5021,7 @@ index eec1e26b6e..47f0b2df6c 100644
private final EntityWolf j;
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 07ebc1d816..8d1f04415e 100644
index 07ebc1d81..8d1f04415 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -44,11 +44,30 @@ public class EntityZombie extends EntityMonster {
@@ -5064,7 +5056,7 @@ index 07ebc1d816..8d1f04415e 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
index da8446d05d..db252ba4e0 100644
index da8446d05..db252ba4e 100644
--- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
+++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie {
@@ -5092,7 +5084,7 @@ index da8446d05d..db252ba4e0 100644
return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
index 8082fa617a..ebbfcb75a4 100644
index 8082fa617..ebbfcb75a 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -25,6 +25,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -5120,7 +5112,7 @@ index 8082fa617a..ebbfcb75a4 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/minecraft/server/FoodInfo.java b/src/main/java/net/minecraft/server/FoodInfo.java
index b35fe21a6d..5b0f35c730 100644
index b35fe21a6..5b0f35c73 100644
--- a/src/main/java/net/minecraft/server/FoodInfo.java
+++ b/src/main/java/net/minecraft/server/FoodInfo.java
@@ -30,6 +30,7 @@ public class FoodInfo {
@@ -5132,7 +5124,7 @@ index b35fe21a6d..5b0f35c730 100644
return this.c;
}
diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
index da49f6e5ae..7b5d602649 100644
index da49f6e5a..7b5d60264 100644
--- a/src/main/java/net/minecraft/server/ItemDye.java
+++ b/src/main/java/net/minecraft/server/ItemDye.java
@@ -42,6 +42,7 @@ public class ItemDye extends Item {
@@ -5144,7 +5136,7 @@ index da49f6e5ae..7b5d602649 100644
return this.b;
}
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
index c4aa38ddf1..3d52a396e6 100644
index c4aa38ddf..3d52a396e 100644
--- a/src/main/java/net/minecraft/server/MathHelper.java
+++ b/src/main/java/net/minecraft/server/MathHelper.java
@@ -263,6 +263,7 @@ public class MathHelper {
@@ -5164,7 +5156,7 @@ index c4aa38ddf1..3d52a396e6 100644
return f1 + f * (f2 - f1);
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
index e07c7674a5..3c077b6870 100644
index e07c7674a..3c077b687 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
@@ -4,8 +4,8 @@ import java.util.EnumSet;
@@ -5187,7 +5179,7 @@ index e07c7674a5..3c077b6870 100644
this.a.a(-1);
} else if (this.a.h((Entity) this.b) > 49.0D) {
diff --git a/src/main/java/net/minecraft/server/ProjectileHelper.java b/src/main/java/net/minecraft/server/ProjectileHelper.java
index 1b796ba5b3..7dbe3500e9 100644
index 1b796ba5b..7dbe3500e 100644
--- a/src/main/java/net/minecraft/server/ProjectileHelper.java
+++ b/src/main/java/net/minecraft/server/ProjectileHelper.java
@@ -15,6 +15,7 @@ public final class ProjectileHelper {
@@ -5199,7 +5191,7 @@ index 1b796ba5b3..7dbe3500e9 100644
return a(entity, flag, false, (Entity) null, raytrace_blockcollisionoption, false, predicate, axisalignedbb);
}
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index 0c7f094e54..62a0810062 100644
index c2e4b5e8d..3838b3b3a 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -27,6 +27,7 @@ public class Vec3D implements IPosition {
@@ -5210,7 +5202,7 @@ index 0c7f094e54..62a0810062 100644
public Vec3D d() {
double d0 = (double) MathHelper.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
@@ -81,6 +82,7 @@ public class Vec3D implements IPosition {
@@ -82,6 +83,7 @@ public class Vec3D implements IPosition {
return d3 * d3 + d4 * d4 + d5 * d5;
}
@@ -5218,7 +5210,7 @@ index 0c7f094e54..62a0810062 100644
public Vec3D a(double d0) {
return this.d(d0, d0, d0);
}
@@ -89,6 +91,7 @@ public class Vec3D implements IPosition {
@@ -90,6 +92,7 @@ public class Vec3D implements IPosition {
return this.d(vec3d.x, vec3d.y, vec3d.z);
}
@@ -5227,10 +5219,10 @@ index 0c7f094e54..62a0810062 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index fb584091af..62daa6d2a6 100644
index bdb12d16f..ad3b81a11 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -995,6 +995,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1020,6 +1020,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}
@@ -5238,7 +5230,7 @@ index fb584091af..62daa6d2a6 100644
public boolean a(AxisAlignedBB axisalignedbb, Material material) {
int i = MathHelper.floor(axisalignedbb.minX);
int j = MathHelper.f(axisalignedbb.maxX);
@@ -1630,4 +1631,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1665,4 +1666,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@Override public BiomeManager d() {
return this.biomeManager;
}
@@ -5250,7 +5242,7 @@ index fb584091af..62daa6d2a6 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index eda37fa43f..69f99a993d 100644
index eda37fa43..69f99a993 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -64,4 +64,603 @@ public class PurpurWorldConfig {
@@ -5859,7 +5851,7 @@ index eda37fa43f..69f99a993d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
new file mode 100644
index 0000000000..828e1b8730
index 000000000..828e1b873
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
@@ -0,0 +1,75 @@
@@ -5940,7 +5932,7 @@ index 0000000000..828e1b8730
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
new file mode 100644
index 0000000000..0a5d6d46c2
index 000000000..0a5d6d46c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
@@ -0,0 +1,86 @@
@@ -6032,7 +6024,7 @@ index 0000000000..0a5d6d46c2
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
new file mode 100644
index 0000000000..3491250704
index 000000000..349125070
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -0,0 +1,53 @@
@@ -6091,7 +6083,7 @@ index 0000000000..3491250704
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
new file mode 100644
index 0000000000..f753759361
index 000000000..f75375936
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlyingWithSpacebar.java
@@ -0,0 +1,61 @@
@@ -6158,7 +6150,7 @@ index 0000000000..f753759361
+}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
new file mode 100644
index 0000000000..e75e580670
index 000000000..e75e58067
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDWater.java
@@ -0,0 +1,43 @@
@@ -6207,7 +6199,7 @@ index 0000000000..e75e580670
+}
diff --git a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java
new file mode 100644
index 0000000000..7189cc569f
index 000000000..7189cc569
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java
@@ -0,0 +1,119 @@
@@ -6332,7 +6324,7 @@ index 0000000000..7189cc569f
+}
diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java
new file mode 100644
index 0000000000..f9e680efd2
index 000000000..f9e680efd
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java
@@ -0,0 +1,126 @@
@@ -6464,7 +6456,7 @@ index 0000000000..f9e680efd2
+}
diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
new file mode 100644
index 0000000000..6e50344c07
index 000000000..6e50344c0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
@@ -0,0 +1,21 @@
@@ -6491,7 +6483,7 @@ index 0000000000..6e50344c07
+}
diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java
new file mode 100644
index 0000000000..9bb9da22aa
index 000000000..9bb9da22a
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHorseHasRider.java
@@ -0,0 +1,21 @@
@@ -6517,10 +6509,10 @@ index 0000000000..9bb9da22aa
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index d16d3fe58e..5246db9636 100644
index 5a7b714cc..ab414917d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1058,4 +1058,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1089,4 +1089,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return getHandle().spawnReason;
}
// Paper end
@@ -6553,7 +6545,7 @@ index d16d3fe58e..5246db9636 100644
+ // Purpur end
}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index 0967ef424b..7125c0477e 100644
index 0967ef424..7125c0477 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1 +1,3 @@

14
patches/server/0009-Logger-settings-suppressing-pointless-logs.patch → patches/server/0010-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -1,4 +1,4 @@
From 0befe14c7c515802c2dcb800db9859c79822d9dd Mon Sep 17 00:00:00 2001
From ff8ebf864e0f3f5d70b43bfbe7353e347897442b 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)
@@ -12,7 +12,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs)
5 files changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index c41e138472..44331cea7c 100644
index c41e13847..44331cea7 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -162,6 +162,7 @@ public class AdvancementDataPlayer {
@@ -24,7 +24,7 @@ index c41e138472..44331cea7c 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/GenericAttributes.java b/src/main/java/net/minecraft/server/GenericAttributes.java
index 469e293c25..ca58302cf7 100644
index 469e293c2..ca58302cf 100644
--- a/src/main/java/net/minecraft/server/GenericAttributes.java
+++ b/src/main/java/net/minecraft/server/GenericAttributes.java
@@ -79,6 +79,7 @@ public class GenericAttributes {
@@ -36,7 +36,7 @@ index 469e293c25..ca58302cf7 100644
} else {
a(attributeinstance, nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
index 73402f2b5a..1c2320cc54 100644
index 73402f2b5..1c2320cc5 100644
--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
+++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java
@@ -47,6 +47,7 @@ public class WorldGenFeatureConfigured<FC extends WorldGenFeatureConfiguration,
@@ -48,7 +48,7 @@ index 73402f2b5a..1c2320cc54 100644
return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2673de8212..d6f82d119e 100644
index 2673de821..d6f82d119 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -128,6 +128,17 @@ public class PurpurConfig {
@@ -70,7 +70,7 @@ index 2673de8212..d6f82d119e 100644
getString("settings.timings.url", "https://timings.pl3x.net");
}
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
index 049e9f98de..1d179cd5bc 100644
index 049e9f98d..1d179cd5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
+++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
@@ -254,6 +254,7 @@ public final class CraftLegacy {
@@ -82,5 +82,5 @@ index 049e9f98de..1d179cd5bc 100644
if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
new Exception().printStackTrace();
--
2.24.0
2.26.2

8
patches/server/0010-Disable-outdated-build-check.patch → patches/server/0011-Disable-outdated-build-check.patch
View File

@@ -1,4 +1,4 @@
From 139d189fa8600958abb4e5d209a2ab6dafdbfe99 Mon Sep 17 00:00:00 2001
From d5aa173e66a65d2bd0f499d1161debd81ed92a57 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 17ebc84f51..ced4acc5f5 100644
index 8d436d275..b007840a5 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
}
@@ -21,5 +21,5 @@ index 17ebc84f51..ced4acc5f5 100644
Calendar deadline = Calendar.getInstance();
--
2.24.0
2.26.2

10
patches/server/0011-Add-obfhelpers-for-plugin-use.patch → patches/server/0012-Add-obfhelpers-for-plugin-use.patch
View File

@@ -1,4 +1,4 @@
From b28d366ed0e2e748cc515c6ac6c5d5a90652f579 Mon Sep 17 00:00:00 2001
From 7ad6f9948748ee7bc32a5f8682016e0d47b27a80 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add obfhelpers for plugin use
3 files changed, 4 insertions(+)
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index fb97c51bb1..50ed4001d1 100644
index fb97c51bb..50ed4001d 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -30,7 +30,7 @@ index fb97c51bb1..50ed4001d1 100644
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
}
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index ea60880c6f..413b888a04 100644
index ea60880c6..413b888a0 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -596,6 +596,7 @@ public final class ItemStack {
@@ -42,7 +42,7 @@ index ea60880c6f..413b888a04 100644
if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
return this.tag.getCompound(s);
diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
index bea4a0b808..c6481c7ff1 100644
index bea4a0b80..c6481c7ff 100644
--- a/src/main/java/net/minecraft/server/NBTTagString.java
+++ b/src/main/java/net/minecraft/server/NBTTagString.java
@@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {
@@ -54,5 +54,5 @@ index bea4a0b808..c6481c7ff1 100644
return s.isEmpty() ? NBTTagString.b : new NBTTagString(s);
}
--
2.24.0
2.26.2

12
patches/server/0012-Silk-touch-spawners.patch → patches/server/0013-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From c458e4eb00beea0dc60c35e6c343e6b013c80a97 Mon Sep 17 00:00:00 2001
From bc8027e2ac0110d889bc31b125cbff05b13b7e70 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
@@ -10,10 +10,10 @@ Subject: [PATCH] Silk touch spawners
3 files changed, 47 insertions(+)
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index d051a54aa0..8c8dc9d6b8 100644
index 66244a9d0..9c7faa2bd 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -501,6 +501,7 @@ public class Block implements IMaterial {
@@ -502,6 +502,7 @@ public class Block implements IMaterial {
iblockdata.dropNaturally(world, blockposition, itemstack);
}
@@ -22,7 +22,7 @@ index d051a54aa0..8c8dc9d6b8 100644
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
float f = 0.5F;
diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
index 5296fdf168..69d04f6cbf 100644
index 5296fdf16..69d04f6cb 100644
--- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
+++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
@@ -11,6 +11,40 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -67,7 +67,7 @@ index 5296fdf168..69d04f6cbf 100644
public void dropNaturally(IBlockData iblockdata, World world, BlockPosition blockposition, ItemStack itemstack) {
super.dropNaturally(iblockdata, world, blockposition, itemstack);
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 5a7494947c..8e8d392a15 100644
index 5a7494947..8e8d392a1 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -136,10 +136,17 @@ public class EntityTypes<T extends Entity> {
@@ -108,5 +108,5 @@ index 5a7494947c..8e8d392a15 100644
if (this.bh == null) {
this.bh = new ChatMessage(this.f(), new Object[0]);
--
2.24.0
2.26.2

10
patches/server/0013-Give-giants-AI.patch → patches/server/0014-Give-giants-AI.patch
View File

@@ -1,4 +1,4 @@
From 32ed6366b03dbec3921692e4297a0674beb0615c Mon Sep 17 00:00:00 2001
From 4b620999fe1c124f14cfcad42fcf1d9c4af85953 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] Give giants AI
@@ -10,7 +10,7 @@ Subject: [PATCH] Give giants AI
3 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index ff8a41a539..4296aaa074 100644
index ff8a41a53..4296aaa07 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -23,6 +23,45 @@ public class EntityGiantZombie extends EntityMonster {
@@ -78,7 +78,7 @@ index ff8a41a539..4296aaa074 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index cbbbc875be..fbca429090 100644
index cbbbc875b..fbca42909 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -867,6 +867,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -98,7 +98,7 @@ index cbbbc875be..fbca429090 100644
float f = difficultydamagescaler.d();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 69f99a993d..7cf7ae3dcb 100644
index 69f99a993..7cf7ae3dc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -255,12 +255,22 @@ public class PurpurWorldConfig {
@@ -125,5 +125,5 @@ index 69f99a993d..7cf7ae3dcb 100644
public boolean guardianRidable = false;
--
2.24.0
2.26.2

8
patches/server/0014-Illusioners-AI-settings.patch → patches/server/0015-Illusioners-AI-settings.patch
View File

@@ -1,4 +1,4 @@
From e5b3ef66104c980b1d533be8844feb0814837194 Mon Sep 17 00:00:00 2001
From 329d09c1593e86d9267736552d421f226208abda 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Illusioners AI settings
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index 3e6722cfce..13545a8efe 100644
index 3e6722cfc..13545a8ef 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -58,9 +58,9 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -26,7 +26,7 @@ index 3e6722cfce..13545a8efe 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7cf7ae3dcb..96a66926fc 100644
index 7cf7ae3dc..96a66926f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -299,10 +299,16 @@ public class PurpurWorldConfig {
@@ -47,5 +47,5 @@ index 7cf7ae3dcb..96a66926fc 100644
public boolean ironGolemRidable = false;
--
2.24.0
2.26.2

8
patches/server/0015-Zombie-horse-naturally-spawn.patch → patches/server/0016-Zombie-horse-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 4af62d22140710d7509e4f573f1ac84394a44c73 Mon Sep 17 00:00:00 2001
From cae7ca5f7ee6a31f421a401abed8141b9037c9a3 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, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 17289cf377..41179fe312 100644
index 24cd10c96..edf24791b 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -601,12 +601,18 @@ public class WorldServer extends World {
@@ -1038,12 +1038,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {
@@ -38,7 +38,7 @@ index 17289cf377..41179fe312 100644
this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 96a66926fc..4c7469b903 100644
index 96a66926f..4c7469b90 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -657,9 +657,11 @@ public class PurpurWorldConfig {

8
patches/server/0016-Charged-creeper-naturally-spawn.patch → patches/server/0017-Charged-creeper-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 136521abd75dada9b5a980379b39c12838c50ff3 Mon Sep 17 00:00:00 2001
From 2de0a875233bb6be5ed54394ac9cba44a7b32764 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Charged creeper naturally spawn
2 files changed, 13 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
index 48fd8e716b..ce366f401f 100644
index 48fd8e716..ce366f401 100644
--- a/src/main/java/net/minecraft/server/EntityCreeper.java
+++ b/src/main/java/net/minecraft/server/EntityCreeper.java
@@ -87,6 +87,17 @@ public class EntityCreeper extends EntityMonster {
@@ -31,7 +31,7 @@ index 48fd8e716b..ce366f401f 100644
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4c7469b903..bbae44ddb5 100644
index 4c7469b90..bbae44ddb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -148,10 +148,12 @@ public class PurpurWorldConfig {
@@ -48,5 +48,5 @@ index 4c7469b903..bbae44ddb5 100644
public boolean dolphinRidable = false;
--
2.24.0
2.26.2

8
patches/server/0017-Rabbit-naturally-spawn-toast-and-killer.patch → patches/server/0018-Rabbit-naturally-spawn-toast-and-killer.patch
View File

@@ -1,4 +1,4 @@
From 7a740eac98a1acd7253c498e690324cd18e42d47 Mon Sep 17 00:00:00 2001
From aeb5f32f4179df8b3e0eace094ed06a31e65b87c 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer
2 files changed, 18 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
index 9040ab1c54..0232226f06 100644
index 9040ab1c5..0232226f0 100644
--- a/src/main/java/net/minecraft/server/EntityRabbit.java
+++ b/src/main/java/net/minecraft/server/EntityRabbit.java
@@ -364,6 +364,10 @@ public class EntityRabbit extends EntityAnimal {
@@ -41,7 +41,7 @@ index 9040ab1c54..0232226f06 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 bbae44ddb5..4aaf75fcf4 100644
index bbae44ddb..4aaf75fcf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -440,10 +440,14 @@ public class PurpurWorldConfig {
@@ -60,5 +60,5 @@ index bbae44ddb5..4aaf75fcf4 100644
public boolean ravagerRidable = false;
--
2.24.0
2.26.2

8
patches/server/0018-Cat-spawning-options.patch → patches/server/0019-Cat-spawning-options.patch
View File

@@ -1,4 +1,4 @@
From 4d0a8cc4bd681061763e57d2addcbfff9a87f6b4 Mon Sep 17 00:00:00 2001
From c673dd6d4a16db19278e99bd2355469d93c2a79f 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Cat spawning options
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 6024478dc0..4b55c07d41 100644
index 6024478dc..4b55c07d4 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -15,7 +15,7 @@ public class MobSpawnerCat {
@@ -57,7 +57,7 @@ index 6024478dc0..4b55c07d41 100644
return list.size() < 1 ? this.a(blockposition, world) : 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4aaf75fcf4..12fbdf65c5 100644
index 4aaf75fcf..12fbdf65c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,10 +101,16 @@ public class PurpurWorldConfig {
@@ -78,5 +78,5 @@ index 4aaf75fcf4..12fbdf65c5 100644
public boolean caveSpiderRidable = false;
--
2.24.0
2.26.2

6
patches/server/0019-Fix-non-black-cat-types-spawning-in-swamp-huts.patch → patches/server/0020-Fix-non-black-cat-types-spawning-in-swamp-huts.patch
View File

@@ -1,4 +1,4 @@
From aa2411409c85d1baa93f157506e929bfcf44d62c Mon Sep 17 00:00:00 2001
From 7f22b67baa5bb382abe62b70dfb1ec5bb7ce5929 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] Fix non black cat types spawning in swamp huts
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix non black cat types spawning in swamp huts
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 4b55c07d41..fa2222355f 100644
index 4b55c07d4..fa2222355 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -84,8 +84,9 @@ public class MobSpawnerCat {
@@ -23,5 +23,5 @@ index 4b55c07d41..fa2222355f 100644
return 1;
}
--
2.24.0
2.26.2

18
patches/server/0020-Cows-eat-mushrooms.patch → patches/server/0021-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 4359121c6cc4b87aa44cdf26bc9bbb55d75d8b67 Mon Sep 17 00:00:00 2001
From f9ab48da215fbf1f9cd45ee9daa0a5860dc2c9a5 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(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1ef13ee78e..0652f63124 100644
index dc72ee435..f5ea12b02 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1098,6 +1098,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1283,6 +1283,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -22,7 +22,7 @@ index 1ef13ee78e..0652f63124 100644
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
@@ -2646,6 +2647,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2831,6 +2832,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -31,7 +31,7 @@ index 1ef13ee78e..0652f63124 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 723a9fa1ee..f56fd7c012 100644
index 723a9fa1e..f56fd7c01 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -34,6 +34,7 @@ public class EntityCow extends EntityAnimal {
@@ -124,10 +124,10 @@ index 723a9fa1ee..f56fd7c012 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 58aa2a9a3e..ea245de18c 100644
index 14dc1318a..bf82399c8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2831,8 +2831,9 @@ public abstract class EntityLiving extends Entity {
@@ -2838,8 +2838,9 @@ public abstract class EntityLiving extends Entity {
this.aK = f;
}
@@ -140,7 +140,7 @@ index 58aa2a9a3e..ea245de18c 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 12fbdf65c5..091f30727f 100644
index 12fbdf65c..091f30727 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,10 +145,12 @@ public class PurpurWorldConfig {
@@ -157,5 +157,5 @@ index 12fbdf65c5..091f30727f 100644
public boolean creeperRidable = false;
--
2.24.0
2.26.2

6
patches/server/0021-Fix-cow-rotation-when-shearing-mooshroom.patch → patches/server/0022-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

@@ -1,4 +1,4 @@
From 79c6e032d882ad999fd65f3eab561f36397bddb6 Mon Sep 17 00:00:00 2001
From 2cafa9014b47d301c4f70ca2503bc8398c260a18 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index 53bc312870..bf835aaf9a 100644
index 53bc31287..bf835aaf9 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -114,7 +114,13 @@ public class EntityMushroomCow extends EntityCow {
@@ -27,5 +27,5 @@ index 53bc312870..bf835aaf9a 100644
entitycow.setCustomName(this.getCustomName());
entitycow.setCustomNameVisible(this.getCustomNameVisible());
--
2.24.0
2.26.2

8
patches/server/0022-Pigs-give-saddle-back.patch → patches/server/0023-Pigs-give-saddle-back.patch
View File

@@ -1,4 +1,4 @@
From 9f40bd20e244a74b5840eff4e216421775c3bf51 Mon Sep 17 00:00:00 2001
From 1807f5647ff8b32508f3af2d41c656d755f46f39 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Pigs give saddle back
2 files changed, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
index e6a7f8ef37..d78666dbb2 100644
index e6a7f8ef3..d78666dbb 100644
--- a/src/main/java/net/minecraft/server/EntityPig.java
+++ b/src/main/java/net/minecraft/server/EntityPig.java
@@ -135,6 +135,18 @@ public class EntityPig extends EntityAnimal {
@@ -32,7 +32,7 @@ index e6a7f8ef37..d78666dbb2 100644
return true;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 091f30727f..85692500b4 100644
index 091f30727..85692500b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,9 +413,11 @@ public class PurpurWorldConfig {
@@ -48,5 +48,5 @@ index 091f30727f..85692500b4 100644
public boolean pillagerRidable = false;
--
2.24.0
2.26.2

20
patches/server/0023-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch → patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From 522d8cbc36b8834ce7c4b5e2cf4192fe37cef25f Mon Sep 17 00:00:00 2001
From 63057fd5e7b4ad844bafe3ef1c87705ff1cd31f7 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
6 files changed, 226 insertions(+), 11 deletions(-)
diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
index f7344d3aec..f6c0165f94 100644
index f7344d3ae..f6c0165f9 100644
--- a/src/main/java/net/minecraft/server/DamageSource.java
+++ b/src/main/java/net/minecraft/server/DamageSource.java
@@ -82,6 +82,7 @@ public class DamageSource {
@@ -25,10 +25,10 @@ index f7344d3aec..f6c0165f94 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 0652f63124..197953e19f 100644
index f5ea12b02..d470c586a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1445,6 +1445,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1630,6 +1630,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return d3 * d3 + d4 * d4 + d5 * d5;
}
@@ -36,7 +36,7 @@ index 0652f63124..197953e19f 100644
public double h(Entity entity) {
return this.c(entity.getPositionVector());
}
@@ -1974,14 +1975,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2159,14 +2160,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}
@@ -55,7 +55,7 @@ index 0652f63124..197953e19f 100644
return null;
} else if (this.world.isClientSide) {
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index a57d0089d8..02952c3af8 100644
index a57d0089d..02952c3af 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
@@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -123,7 +123,7 @@ index a57d0089d8..02952c3af8 100644
@Override
protected void b(NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 777bc95eef..2650770489 100644
index 777bc95ee..265077048 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -350,7 +350,7 @@ index 777bc95eef..2650770489 100644
return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 3bc57ef91d..e0d97d2c8b 100644
index 3bc57ef91..e0d97d2c8 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -34,6 +34,7 @@ public interface IEntityAccess {
@@ -362,7 +362,7 @@ index 3bc57ef91d..e0d97d2c8b 100644
return this.a(oclass, axisalignedbb, IEntitySelector.f);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 85692500b4..c9b41cebd6 100644
index 85692500b..c9b41cebd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -402,6 +402,9 @@ public class PurpurWorldConfig {
@@ -386,5 +386,5 @@ index 85692500b4..c9b41cebd6 100644
public boolean pigRidable = false;
--
2.24.0
2.26.2

8
patches/server/0024-Snowman-drop-and-put-back-pumpkin.patch → patches/server/0025-Snowman-drop-and-put-back-pumpkin.patch
View File

@@ -1,4 +1,4 @@
From f7ebb12367af42882a2ad9c9cc7e4414197bc40b Mon Sep 17 00:00:00 2001
From 5081aa5658129a710de30dd52ed5053707b0887e 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Snowman drop and put back pumpkin
2 files changed, 21 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 65d7468997..3f6f8ad454 100644
index 65d746899..3f6f8ad45 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -7,6 +7,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -47,7 +47,7 @@ index 65d7468997..3f6f8ad454 100644
return tryRide(entityhuman, enumhand); // Purpur
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c9b41cebd6..56b67c4082 100644
index c9b41cebd..56b67c408 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -540,11 +540,15 @@ public class PurpurWorldConfig {
@@ -67,5 +67,5 @@ index c9b41cebd6..56b67c4082 100644
public boolean spiderRidable = false;
--
2.24.0
2.26.2

8
patches/server/0025-Ender-dragon-always-drop-egg.patch → patches/server/0026-Ender-dragon-always-drop-egg.patch
View File

@@ -1,4 +1,4 @@
From 5b5cebc495d4db4f7eddd40c578e7d4fa9faf36a Mon Sep 17 00:00:00 2001
From 6e1fb8864c1acffb17aa73a8d86d2090c574f2b1 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop egg
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 687efa022d..ead3346072 100644
index 687efa022..ead334607 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -21,7 +21,7 @@ public class EnderDragonBattle {
@@ -39,7 +39,7 @@ index 687efa022d..ead3346072 100644
return this.l;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 56b67c4082..cc6f8563b1 100644
index 56b67c408..cc6f8563b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -206,11 +206,13 @@ public class PurpurWorldConfig {
@@ -57,5 +57,5 @@ index 56b67c4082..cc6f8563b1 100644
public boolean endermanRidable = false;
--
2.24.0
2.26.2

8
patches/server/0026-Ender-dragon-always-drop-full-exp.patch → patches/server/0027-Ender-dragon-always-drop-full-exp.patch
View File

@@ -1,4 +1,4 @@
From 5cfee6aa56787421ed223aad2ebcbf6fd108be63 Mon Sep 17 00:00:00 2001
From fad47974bd2b9b98b527eca3f3f4322f4fe6ba4f 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Ender dragon always drop full exp
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index ab1747198a..f06fde3242 100644
index 54b63395f..e89b96605 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -641,7 +641,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -22,7 +22,7 @@ index ab1747198a..f06fde3242 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cc6f8563b1..426e6f18bd 100644
index cc6f8563b..426e6f18b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -207,12 +207,14 @@ public class PurpurWorldConfig {
@@ -41,5 +41,5 @@ index cc6f8563b1..426e6f18bd 100644
public boolean endermanRidable = false;
--
2.24.0
2.26.2

10
patches/server/0027-Signs-editable-on-right-click.patch → patches/server/0028-Signs-editable-on-right-click.patch
View File

@@ -1,4 +1,4 @@
From d724d49d366b35c1181dd2fc15e42daade8f1ce6 Mon Sep 17 00:00:00 2001
From ce9eea9c6ac12ed7d3a82601390684864ab5f0c2 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Signs editable on right click
3 files changed, 17 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockSign.java b/src/main/java/net/minecraft/server/BlockSign.java
index 8a31054a1d..d20849ce2b 100644
index 8a31054a1..d20849ce2 100644
--- a/src/main/java/net/minecraft/server/BlockSign.java
+++ b/src/main/java/net/minecraft/server/BlockSign.java
@@ -56,6 +56,17 @@ public abstract class BlockSign extends BlockTileEntity implements IBlockWaterlo
@@ -32,7 +32,7 @@ index 8a31054a1d..d20849ce2b 100644
} else {
return EnumInteractionResult.PASS;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 0e9a90b70f..099d98e04c 100644
index 0e9a90b70..099d98e04 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -109,6 +109,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -44,7 +44,7 @@ index 0e9a90b70f..099d98e04c 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 426e6f18bd..f098a36b51 100644
index 426e6f18b..f098a36b5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -65,6 +65,11 @@ public class PurpurWorldConfig {
@@ -60,5 +60,5 @@ index 426e6f18bd..f098a36b51 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
--
2.24.0
2.26.2

6
patches/server/0028-Fix-outdated-server-showing-in-ping-before-server-fu.patch → patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
View File

@@ -1,4 +1,4 @@
From be19ef44f61995d316120b8dd763c91cd8a2d56d Mon Sep 17 00:00:00 2001
From 8dc9cf85d82ebcfb89d97fb0bd172bb58794b9d4 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 4bb21c48bd..30f16db02c 100644
index 4bb21c48b..30f16db02 100644
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -135,6 +135,7 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -21,5 +21,5 @@ index 4bb21c48bd..30f16db02c 100644
// Paper end
}
--
2.24.0
2.26.2

8
patches/server/0029-Make-Iron-Golems-Swim.patch → patches/server/0030-Make-Iron-Golems-Swim.patch
View File

@@ -1,4 +1,4 @@
From 7091b58fda2ba308981493e7d38cb0d28e34b871 Mon Sep 17 00:00:00 2001
From 2379deeae65cfb447a5c515621504e1092df675f 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Make Iron Golems Swim
2 files changed, 3 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
index 288a043fbd..0cc3b8eb01 100644
index 288a043fb..0cc3b8eb0 100644
--- a/src/main/java/net/minecraft/server/EntityIronGolem.java
+++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
@@ -36,6 +36,7 @@ public class EntityIronGolem extends EntityGolem {
@@ -21,7 +21,7 @@ index 288a043fbd..0cc3b8eb01 100644
this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true));
this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F));
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f098a36b51..a077819292 100644
index f098a36b5..a07781929 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -333,10 +333,12 @@ public class PurpurWorldConfig {
@@ -38,5 +38,5 @@ index f098a36b51..a077819292 100644
public boolean llamaRidable = false;
--
2.24.0
2.26.2

8
patches/server/0030-Allow-soil-to-moisten-from-water-directly-under-it.patch → patches/server/0031-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -1,4 +1,4 @@
From 107b47e289b36fc4e4f9568dbf0958ed0cad3101 Mon Sep 17 00:00:00 2001
From e011cfd4126e1395968162a6cab6efb62c3eb9f2 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockSoil.java b/src/main/java/net/minecraft/server/BlockSoil.java
index b6561f2c79..f2ab3ee011 100644
index b6561f2c7..f2ab3ee01 100644
--- a/src/main/java/net/minecraft/server/BlockSoil.java
+++ b/src/main/java/net/minecraft/server/BlockSoil.java
@@ -1,6 +1,5 @@
@@ -47,7 +47,7 @@ index b6561f2c79..f2ab3ee011 100644
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a077819292..e2bda806ec 100644
index a07781929..e2bda806e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -65,6 +65,11 @@ public class PurpurWorldConfig {
@@ -63,5 +63,5 @@ index a077819292..e2bda806ec 100644
private void signSettings() {
signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit);
--
2.24.0
2.26.2

14
patches/server/0031-Controllable-Minecarts.patch → patches/server/0032-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 22464945049dd22fcd1a5ccf19c4985e6f8d011b Mon Sep 17 00:00:00 2001
From 541d671db22a2a086ddeba4f4c5ba8eaf434c54c 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
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 197953e19f..5d39d86f0f 100644
index d470c586a..08645bd03 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1346,6 +1346,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1531,6 +1531,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}
@@ -23,7 +23,7 @@ index 197953e19f..5d39d86f0f 100644
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 665bbe07fa..1f3e5bd288 100644
index 665bbe07f..1f3e5bd28 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -357,12 +357,50 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -78,7 +78,7 @@ index 665bbe07fa..1f3e5bd288 100644
this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index b73e317fbb..e1337a9c04 100644
index b73e317fb..e1337a9c0 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -103,7 +103,7 @@ index b73e317fbb..e1337a9c04 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e2bda806ec..f8992136a7 100644
index e2bda806e..f8992136a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,10 +1,16 @@
@@ -157,5 +157,5 @@ index e2bda806ec..f8992136a7 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
--
2.24.0
2.26.2

12
patches/server/0032-Signs-allow-color-codes.patch → patches/server/0033-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From cf9b6fc643b669c8ecb12ae738fae6269ba21867 Mon Sep 17 00:00:00 2001
From a0ea1376878fa8133038da715d91e313a60d4329 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Signs allow color codes
4 files changed, 25 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4ecc89ac44..2a70beedc2 100644
index 4ecc89ac4..2a70beedc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1148,6 +1148,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,10 +23,10 @@ index 4ecc89ac44..2a70beedc2 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7123e197c7..4ac20e1ecc 100644
index 1859cd296..944610737 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2623,6 +2623,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2640,6 +2640,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end
@@ -42,7 +42,7 @@ index 7123e197c7..4ac20e1ecc 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 099d98e04c..19d76c8cce 100644
index 099d98e04..19d76c8cc 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 099d98e04c..19d76c8cce 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 f8992136a7..94744c78ba 100644
index f8992136a..94744c78b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -76,8 +76,10 @@ public class PurpurWorldConfig {

16
patches/server/0033-Campfires-have-regen-effect.patch → patches/server/0034-Campfires-have-regen-effect.patch
View File

@@ -1,4 +1,4 @@
From d89c8591d4ebe87d0aeadf9a92f5a9ca85a1beba Mon Sep 17 00:00:00 2001
From 47201ce57f115901505987858cc16e919b551f0c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Campfires have regen effect
@@ -12,7 +12,7 @@ Subject: [PATCH] Campfires have regen effect
5 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 6303be944c..65f8d803b8 100644
index 6303be944..65f8d803b 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -8,7 +8,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -25,10 +25,10 @@ index 6303be944c..65f8d803b8 100644
public static final BlockStateDirection e = BlockProperties.N;
private static final VoxelShape f = Block.a(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ea245de18c..10c222ddb2 100644
index bf82399c8..10af384d6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2791,10 +2791,19 @@ public abstract class EntityLiving extends Entity {
@@ -2798,10 +2798,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -52,7 +52,7 @@ index ea245de18c..10c222ddb2 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index b56b021b4c..fcc5a5c234 100644
index b56b021b4..fcc5a5c23 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -92,6 +92,7 @@ public class EntityPotion extends EntityProjectile {
@@ -96,7 +96,7 @@ index b56b021b4c..fcc5a5c234 100644
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index a1580b8c6d..618ca2d763 100644
index a1580b8c6..618ca2d76 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -165,7 +165,7 @@ index a1580b8c6d..618ca2d763 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 94744c78ba..d8d95d787f 100644
index 94744c78b..d8d95d787 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -71,6 +71,29 @@ public class PurpurWorldConfig {
@@ -199,5 +199,5 @@ index 94744c78ba..d8d95d787f 100644
private void farmlandSettings() {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
--
2.24.0
2.26.2

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

@@ -1,4 +1,4 @@
From 446502ec75432982c848f4a2e84eb4c7824de048 Mon Sep 17 00:00:00 2001
From 0052f3bced71e7dbbf3d28cfb11bfb2824596d94 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, 4 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 10c222ddb2..21b5bc47d7 100644
index 10af384d6..4e23d6d3a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1374,8 +1374,10 @@ public abstract class EntityLiving extends Entity {
@@ -24,7 +24,7 @@ index 10c222ddb2..21b5bc47d7 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 d8d95d787f..8c84431e59 100644
index d8d95d787..8c84431e5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -112,6 +112,7 @@ public class PurpurWorldConfig {
@@ -44,5 +44,5 @@ index d8d95d787f..8c84431e59 100644
public boolean batRidable = false;
--
2.24.0
2.26.2

12
patches/server/0035-Campfires-burn-out-in-rain.patch → patches/server/0036-Campfires-burn-out-in-rain.patch
View File

@@ -1,4 +1,4 @@
From f8286ee301aafa334f5f547a3b0e2763dbaf79a7 Mon Sep 17 00:00:00 2001
From e95433c37c07dd0343e1336c9a49661974ddc28f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 21:30:49 -0500
Subject: [PATCH] Campfires burn out in rain
@@ -10,10 +10,10 @@ Subject: [PATCH] Campfires burn out in rain
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 8c8dc9d6b8..13981967b3 100644
index 9c7faa2bd..97e553b38 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -394,7 +394,7 @@ public class Block implements IMaterial {
@@ -395,7 +395,7 @@ public class Block implements IMaterial {
PacketDebug.a(world, blockposition);
}
@@ -23,7 +23,7 @@ index 8c8dc9d6b8..13981967b3 100644
}
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 65f8d803b8..3b95dfaaae 100644
index 65f8d803b..3b95dfaaa 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
@@ -58,7 +58,7 @@ index 65f8d803b8..3b95dfaaae 100644
public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
if ((Boolean) iblockdata.get(BlockCampfire.d)) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8c84431e59..a761b2c734 100644
index 8c84431e5..a761b2c73 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -81,6 +81,7 @@ public class PurpurWorldConfig {
@@ -78,5 +78,5 @@ index 8c84431e59..a761b2c734 100644
public boolean farmlandGetsMoistFromBelow = false;
--
2.24.0
2.26.2

8
patches/server/0036-Campfires-should-fall-with-gravity.patch → patches/server/0037-Campfires-should-fall-with-gravity.patch
View File

@@ -1,4 +1,4 @@
From 94def13a47b03244a57d1da80c6a9839cd7a9fc3 Mon Sep 17 00:00:00 2001
From dd79210dd48515873533b7a50d14eab5db537495 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 16:20:21 -0500
Subject: [PATCH] Campfires should fall with gravity
@@ -9,7 +9,7 @@ Subject: [PATCH] Campfires should fall with gravity
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 3b95dfaaae..418fa6d1fe 100644
index 3b95dfaaa..418fa6d1f 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -9,7 +9,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -59,7 +59,7 @@ index 3b95dfaaae..418fa6d1fe 100644
if (flag) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a761b2c734..d6405b2ec5 100644
index a761b2c73..d6405b2ec 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -82,6 +82,7 @@ public class PurpurWorldConfig {
@@ -79,5 +79,5 @@ index a761b2c734..d6405b2ec5 100644
public boolean farmlandGetsMoistFromBelow = false;
--
2.24.0
2.26.2

14
patches/server/0037-Dont-send-useless-entity-packets.patch → patches/server/0038-Dont-send-useless-entity-packets.patch
View File

@@ -1,4 +1,4 @@
From 041d671573323148c0992ea04a534ffe6beee106 Mon Sep 17 00:00:00 2001
From 610bf17eeaba736705cb6223e21e9f03327de3b3 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 5cc89c0cf9..390cb8e767 100644
index 1bd703848..adf7c9180 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -169,6 +169,7 @@ public class EntityTrackerEntry {
@@ -170,6 +170,7 @@ public class EntityTrackerEntry {
this.o = 0;
packet1 = new PacketPlayOutEntityTeleport(this.tracker);
}
@@ -21,7 +21,7 @@ index 5cc89c0cf9..390cb8e767 100644
}
if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
@@ -255,6 +256,22 @@ public class EntityTrackerEntry {
@@ -256,6 +257,22 @@ public class EntityTrackerEntry {
}
@@ -45,7 +45,7 @@ index 5cc89c0cf9..390cb8e767 100644
this.tracker.c(entityplayer);
entityplayer.c(this.tracker);
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
index e5da2b19c1..5b1d959354 100644
index e5da2b19c..5b1d95935 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
+++ b/src/main/java/net/minecraft/server/PacketPlayOutEntity.java
@@ -5,11 +5,11 @@ import java.io.IOException;
@@ -66,7 +66,7 @@ index e5da2b19c1..5b1d959354 100644
protected boolean h;
protected boolean i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d6f82d119e..d3e1c8c407 100644
index d6f82d119..d3e1c8c40 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig {
@@ -82,5 +82,5 @@ index d6f82d119e..d3e1c8c407 100644
getString("settings.timings.url", "https://timings.pl3x.net");
}
--
2.24.0
2.26.2

34
patches/server/0038-Implement-AFK-API.patch → patches/server/0039-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 8e1600d2455ebc20f0534f28db43d60b2d8c1538 Mon Sep 17 00:00:00 2001
From c98618cb1f74db04eb19104e28223a0238d9b696 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] Implement AFK API
@@ -18,10 +18,10 @@ Subject: [PATCH] Implement AFK API
11 files changed, 111 insertions(+), 25 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 5d39d86f0f..46bc91524b 100644
index 08645bd03..580843686 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1438,6 +1438,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1623,6 +1623,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}
@@ -30,7 +30,7 @@ index 5d39d86f0f..46bc91524b 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 27cfc6654e..d62174e9c7 100644
index 27cfc6654..d62174e9c 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -50,7 +50,7 @@ index 27cfc6654e..d62174e9c7 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 2a70beedc2..96f98926eb 100644
index 2a70beedc..96f98926e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1641,8 +1641,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -106,7 +106,7 @@ index 2a70beedc2..96f98926eb 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 e0d97d2c8b..e1a7926d7a 100644
index e0d97d2c8..e1a7926d7 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -150,28 +150,18 @@ public interface IEntityAccess {
@@ -151,7 +151,7 @@ index e0d97d2c8b..e1a7926d7a 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 1398c47a2f..0bf1a14b7c 100644
index 1398c47a2..0bf1a14b7 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;
@@ -171,7 +171,7 @@ index 1398c47a2f..0bf1a14b7c 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4ac20e1ecc..57e8c22d05 100644
index 944610737..09cab5a99 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -187,7 +187,7 @@ index 4ac20e1ecc..57e8c22d05 100644
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
}
@@ -449,6 +455,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -456,6 +462,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -196,7 +196,7 @@ index 4ac20e1ecc..57e8c22d05 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1141,6 +1149,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1158,6 +1166,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -206,10 +206,10 @@ index 4ac20e1ecc..57e8c22d05 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 40b522a1bf..57ec42c732 100644
index edf24791b..156c87ed4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -409,7 +409,7 @@ public class WorldServer extends World {
@@ -846,7 +846,7 @@ public class WorldServer extends World {
}
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -218,7 +218,7 @@ index 40b522a1bf..57ec42c732 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -727,7 +727,7 @@ public class WorldServer extends World {
@@ -1165,7 +1165,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -228,7 +228,7 @@ index 40b522a1bf..57ec42c732 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d6405b2ec5..41dd1b8616 100644
index d6405b2ec..41dd1b861 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -138,6 +138,17 @@ public class PurpurWorldConfig {
@@ -250,7 +250,7 @@ index d6405b2ec5..41dd1b8616 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 141003ca71..e15c123878 100644
index 141003ca7..e15c12387 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2086,4 +2086,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -276,7 +276,7 @@ index 141003ca71..e15c123878 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f735217e7a..818f8070c5 100644
index f735217e7..818f8070c 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange
@@ -288,7 +288,7 @@ index f735217e7a..818f8070c5 100644
ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index 7125c0477e..e925e1374d 100644
index 7125c0477..e925e1374 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1,3 +1,5 @@

8
patches/server/0039-Option-to-toggle-milk-curing-bad-omen.patch → patches/server/0040-Option-to-toggle-milk-curing-bad-omen.patch
View File

@@ -1,4 +1,4 @@
From 28b04ef1fe86e3426ce788782a77877c4ee6e792 Mon Sep 17 00:00:00 2001
From 1b2547a4ad9ca6eaa524538e0d6a747cf617a600 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Option to toggle milk curing bad omen
2 files changed, 5 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
index 6b255e09ac..e1d3894ab7 100644
index 6b255e09a..e1d3894ab 100644
--- a/src/main/java/net/minecraft/server/ItemMilkBucket.java
+++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
@@ -20,7 +20,10 @@ public class ItemMilkBucket extends Item {
@@ -24,7 +24,7 @@ index 6b255e09ac..e1d3894ab7 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 41dd1b8616..7cbb1df7ab 100644
index 41dd1b861..7cbb1df7a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -117,6 +117,7 @@ public class PurpurWorldConfig {
@@ -44,5 +44,5 @@ index 41dd1b8616..7cbb1df7ab 100644
public boolean idleTimeoutKick = true;
--
2.24.0
2.26.2

12
patches/server/0040-Mending-mends-most-damages-equipment-first.patch → patches/server/0041-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From 1a2bf40259378ed601f5aa34a4f834d412ac2e0e Mon Sep 17 00:00:00 2001
From 0b0660101e3557de12bb44ca705c1d736861c7f6 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
4 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
index d96c03a1a1..da1cfc1d3f 100644
index d96c03a1a..da1cfc1d3 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -246,9 +246,32 @@ public class EnchantmentManager {
@@ -49,7 +49,7 @@ index d96c03a1a1..da1cfc1d3f 100644
}
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 53c6c33892..0fae3693c9 100644
index 53c6c3389..0fae3693c 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -225,7 +225,7 @@ public class EntityExperienceOrb extends Entity {
@@ -62,7 +62,7 @@ index 53c6c33892..0fae3693c9 100644
if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 413b888a04..ce6a466852 100644
index 413b888a0..ce6a46685 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -370,10 +370,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index 413b888a04..ce6a466852 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 7cbb1df7ab..b76a8c5bee 100644
index 7cbb1df7a..b76a8c5be 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,6 +118,7 @@ public class PurpurWorldConfig {
@@ -106,5 +106,5 @@ index 7cbb1df7ab..b76a8c5bee 100644
public boolean idleTimeoutKick = true;
--
2.24.0
2.26.2

10
patches/server/0041-Tulips-change-fox-type.patch → patches/server/0042-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From fe135b5240b7ddecd167e01f167a86b2ee92892e Mon Sep 17 00:00:00 2001
From 5b624aa8deb3cfbba28a2f8dbee3ac28b61afad6 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Tulips change fox type
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 4f53090d3d..13afd7bcde 100644
index 4f53090d3..13afd7bcd 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -37,9 +37,9 @@ public class EntityFox extends EntityAnimal {
@@ -75,7 +75,7 @@ index 4f53090d3d..13afd7bcde 100644
public void onMount(EntityHuman entityhuman) {
super.onMount(entityhuman);
diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
index 54670f64cf..9c9b93f280 100644
index 54670f64c..9c9b93f28 100644
--- a/src/main/java/net/minecraft/server/Items.java
+++ b/src/main/java/net/minecraft/server/Items.java
@@ -106,8 +106,8 @@ public class Items {
@@ -90,7 +90,7 @@ index 54670f64cf..9c9b93f280 100644
public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b76a8c5bee..a2fce0c635 100644
index b76a8c5be..a2fce0c63 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -335,10 +335,12 @@ public class PurpurWorldConfig {
@@ -107,5 +107,5 @@ index b76a8c5bee..a2fce0c635 100644
public boolean ghastRidable = false;
--
2.24.0
2.26.2

10
patches/server/0042-Pillager-limits-and-leaders-chance.patch → patches/server/0043-Pillager-limits-and-leaders-chance.patch
View File

@@ -1,4 +1,4 @@
From 21c076c767f3a22e0ca03b2f0905eb8c6045920c Mon Sep 17 00:00:00 2001
From 48d14d7c57478a6af1c85d20a59ebef69b43ec9e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 22 Jul 2019 14:24:26 -0500
Subject: [PATCH] Pillager limits and leaders chance
@@ -10,7 +10,7 @@ Subject: [PATCH] Pillager limits and leaders chance
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
index 70f43c5159..fa08b8e1ab 100644
index 70f43c515..fa08b8e1a 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
@@ -143,6 +143,7 @@ public class ChunkProviderGenerate extends ChunkGeneratorAbstract<GeneratorSetti
@@ -22,7 +22,7 @@ index 70f43c5159..fa08b8e1ab 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
index f44334b9e1..70559714ac 100644
index f44334b9e..70559714a 100644
--- a/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
+++ b/src/main/java/net/minecraft/server/EntityMonsterPatrolling.java
@@ -49,6 +49,7 @@ public abstract class EntityMonsterPatrolling extends EntityMonster {
@@ -47,7 +47,7 @@ index f44334b9e1..70559714ac 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a2fce0c635..299b080c89 100644
index a2fce0c63..299b080c8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -525,10 +525,16 @@ public class PurpurWorldConfig {
@@ -68,5 +68,5 @@ index a2fce0c635..299b080c89 100644
public boolean polarBearRidable = false;
--
2.24.0
2.26.2

44
patches/server/0043-Make-the-GUI-better.patch → patches/server/0044-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From a6b04c3367e30b636a384c0d9eed2e549d01b3b1 Mon Sep 17 00:00:00 2001
From c7bf2097ea8720ae860d8ad95a6a989a91094161 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -40,7 +40,7 @@ Subject: [PATCH] Make the GUI better
create mode 100644 src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 64adf186d9..b29f5dc8c2 100644
index 3190c709a..7f2db5f0b 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -8,6 +8,8 @@ import com.mojang.authlib.GameProfileRepository;
@@ -69,7 +69,7 @@ index 64adf186d9..b29f5dc8c2 100644
new com.destroystokyo.paper.console.PaperConsole(DedicatedServer.this).start();
/*
jline.console.ConsoleReader bufferedreader = reader;
@@ -420,7 +423,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -421,7 +424,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@Override
public void exit() {
if (this.p != null) {
@@ -78,7 +78,7 @@ index 64adf186d9..b29f5dc8c2 100644
}
if (this.remoteControlListener != null) {
@@ -520,7 +523,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -521,7 +524,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void bc() {
if (this.p == null) {
@@ -88,10 +88,10 @@ index 64adf186d9..b29f5dc8c2 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1da54dba9f..447e9ea4ec 100644
index 28d92cbce..da8c98356 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1375,6 +1375,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1435,6 +1435,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true;
}
@@ -101,7 +101,7 @@ index 1da54dba9f..447e9ea4ec 100644
}
diff --git a/src/main/java/net/pl3x/purpur/gui/ServerGUI.java b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
new file mode 100644
index 0000000000..973b5efef5
index 000000000..973b5efef
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
@@ -0,0 +1,123 @@
@@ -230,7 +230,7 @@ index 0000000000..973b5efef5
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
new file mode 100644
index 0000000000..55feec811f
index 000000000..55feec811
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/console/JColorTextPane.java
@@ -0,0 +1,81 @@
@@ -317,7 +317,7 @@ index 0000000000..55feec811f
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
new file mode 100644
index 0000000000..fb017a0708
index 000000000..fb017a070
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/console/JConsolePanel.java
@@ -0,0 +1,128 @@
@@ -451,7 +451,7 @@ index 0000000000..fb017a0708
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
new file mode 100644
index 0000000000..4e0b80fddb
index 000000000..4e0b80fdd
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/DetailsListSelectionModel.java
@@ -0,0 +1,21 @@
@@ -478,7 +478,7 @@ index 0000000000..4e0b80fddb
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
new file mode 100644
index 0000000000..c4903c7db6
index 000000000..c4903c7db
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
@@ -0,0 +1,42 @@
@@ -526,7 +526,7 @@ index 0000000000..c4903c7db6
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
new file mode 100644
index 0000000000..1e049d575b
index 000000000..1e049d575
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -0,0 +1,59 @@
@@ -591,7 +591,7 @@ index 0000000000..1e049d575b
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
new file mode 100644
index 0000000000..2fdb9bdd0d
index 000000000..2fdb9bdd0
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphColor.java
@@ -0,0 +1,44 @@
@@ -641,7 +641,7 @@ index 0000000000..2fdb9bdd0d
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
new file mode 100644
index 0000000000..85babad9cd
index 000000000..85babad9c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/GraphData.java
@@ -0,0 +1,47 @@
@@ -694,7 +694,7 @@ index 0000000000..85babad9cd
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
new file mode 100644
index 0000000000..0c0c73beeb
index 000000000..0c0c73bee
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/graph/RAMGraph.java
@@ -0,0 +1,144 @@
@@ -844,7 +844,7 @@ index 0000000000..0c0c73beeb
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
new file mode 100644
index 0000000000..17e75a2070
index 000000000..17e75a207
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/JPlayerList.java
@@ -0,0 +1,57 @@
@@ -907,7 +907,7 @@ index 0000000000..17e75a2070
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
new file mode 100644
index 0000000000..2f02e9adc7
index 000000000..2f02e9adc
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListCellRenderer.java
@@ -0,0 +1,22 @@
@@ -935,7 +935,7 @@ index 0000000000..2f02e9adc7
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
new file mode 100644
index 0000000000..edbf454163
index 000000000..edbf45416
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListModel.java
@@ -0,0 +1,47 @@
@@ -988,7 +988,7 @@ index 0000000000..edbf454163
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
new file mode 100644
index 0000000000..13a5eb3ad3
index 000000000..13a5eb3ad
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/playerlist/PlayerListMouseAdapter.java
@@ -0,0 +1,32 @@
@@ -1026,7 +1026,7 @@ index 0000000000..13a5eb3ad3
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
new file mode 100644
index 0000000000..973c8ddf93
index 000000000..973c8ddf9
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/util/GUIColor.java
@@ -0,0 +1,54 @@
@@ -1086,7 +1086,7 @@ index 0000000000..973c8ddf93
+}
diff --git a/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
new file mode 100644
index 0000000000..4b340b88a2
index 000000000..4b340b88a
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/util/HighlightErrorConverter.java
@@ -0,0 +1,86 @@
@@ -1177,7 +1177,7 @@ index 0000000000..4b340b88a2
+
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 8af159abd3..5bc278a995 100644
index 8af159abd..5bc278a99 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -1,8 +1,17 @@

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

@@ -1,4 +1,4 @@
From 2f72a538bb9769b59e5d9c52f4ff1869e5178117 Mon Sep 17 00:00:00 2001
From 0bd8ceb166c07de1bc7c9c542f3cd811ce33c544 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 96f98926eb..9773923735 100644
index 96f98926e..977392373 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1121,7 +1121,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

16
patches/server/0045-Add-EntityPortalReadyEvent.patch → patches/server/0046-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From b57d0b74f8cafb178eada55ddc0ea8370bc9da1e Mon Sep 17 00:00:00 2001
From 76ab9614c42d949915127a45567be02453e414ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent
@@ -11,7 +11,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 09c7c13183..6880cdd7f9 100644
index 09c7c1318..6880cdd7f 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -54,6 +54,7 @@ public class BlockPortal extends Block {
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 46bc91524b..39bd34ab34 100644
index 580843686..bdf79302b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -170,9 +170,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 46bc91524b..39bd34ab34 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2287,6 +2287,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2472,6 +2472,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();
@@ -111,7 +111,7 @@ index 46bc91524b..39bd34ab34 100644
if (this instanceof EntityPlayer) {
((EntityPlayer) this).a(this.world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER ? DimensionManager.OVERWORLD : DimensionManager.NETHER, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index f84dd6d9be..f50e9670bc 100644
index f84dd6d9b..f50e9670b 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -11,6 +11,7 @@ public class PortalTravelAgent {
@@ -141,7 +141,7 @@ index f84dd6d9be..f50e9670bc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8018bf6dd8..3546424a1c 100644
index 156c87ed4..610542dc8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -76,7 +76,7 @@ public class WorldServer extends World {
@@ -152,7 +152,7 @@ index 8018bf6dd8..3546424a1c 100644
+ public PortalTravelAgent portalTravelAgent; // Purpur - private final -> public non-final
private final TickListServer<Block> nextTickListBlock;
private final TickListServer<FluidType> nextTickListFluid;
private final Set<NavigationAbstract> navigators;
private final Set<NavigationAbstract> navigators; final com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<NavigationAbstract> navigatorsForIteration = new com.tuinity.tuinity.util.maplist.IteratorSafeOrderedReferenceSet<>(2048, 0.5f, 2048, 0.2); // Tuinity - make removing entities while ticking safe
--
2.24.0
2.26.2

31
patches/server/0046-Implement-elytra-settings.patch → patches/server/0047-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From 06d3e2899cea8bb9a7a4143b6acf6afc157e14f3 Mon Sep 17 00:00:00 2001
From 2e3222b946ccfa16d3474c905c0882cc8476fb57 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 | 1 +
.../java/net/pl3x/purpur/PurpurWorldConfig.java | 13 +++++++++++++
6 files changed, 49 insertions(+), 4 deletions(-)
5 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 21b5bc47d7..c1cc24cf11 100644
index 4e23d6d3a..677c2dc4f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2658,9 +2658,16 @@ public abstract class EntityLiving extends Entity {
@@ -26,7 +25,7 @@ index 21b5bc47d7..c1cc24cf11 100644
+ // Purpur start
+ int damage = world.purpurConfig.elytraDamagePerSecond;
+ if (world.purpurConfig.elytraDamageMultiplyBySpeed > 0) {
+ double speed = getMot().length();
+ double speed = getMot().magnitudeSquared();
+ if (speed > world.purpurConfig.elytraDamageMultiplyBySpeed) {
+ damage *= (int) speed;
+ }
@@ -37,7 +36,7 @@ index 21b5bc47d7..c1cc24cf11 100644
} else {
flag = false;
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index bd524a35bb..c0e8cd0cdc 100644
index bd524a35b..c0e8cd0cd 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -39,6 +39,14 @@ public class ItemFireworks extends Item {
@@ -56,7 +55,7 @@ index bd524a35bb..c0e8cd0cdc 100644
itemstack.subtract(1);
} else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index ce6a466852..8c3bbef666 100644
index ce6a46685..8c3bbef66 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -402,7 +402,7 @@ public final class ItemStack {
@@ -82,7 +81,7 @@ index ce6a466852..8c3bbef666 100644
if (this.count == 1 && t0 instanceof EntityHuman) {
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java
index f571a1586d..c26300eacd 100644
index f571a1586..c26300eac 100644
--- a/src/main/java/net/minecraft/server/ItemTrident.java
+++ b/src/main/java/net/minecraft/server/ItemTrident.java
@@ -100,6 +100,16 @@ public class ItemTrident extends Item {
@@ -102,20 +101,8 @@ index f571a1586d..c26300eacd 100644
entityhuman.h((double) f2, (double) f3, (double) f4);
entityhuman.r(20);
if (entityhuman.onGround) {
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index 62a0810062..53e7e82688 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -100,6 +100,7 @@ public class Vec3D implements IPosition {
return (double) MathHelper.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
}
+ public double length() { return this.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 299b080c89..5318a8e327 100644
index 299b080c8..5318a8e32 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -142,6 +142,19 @@ public class PurpurWorldConfig {
@@ -139,5 +126,5 @@ index 299b080c89..5318a8e327 100644
public boolean idleTimeoutTickNearbyEntities = true;
public boolean idleTimeoutCountAsSleeping = false;
--
2.24.0
2.26.2

10
patches/server/0047-Add-blacklist-option-for-grindstone.patch → patches/server/0048-Add-blacklist-option-for-grindstone.patch
View File

@@ -1,4 +1,4 @@
From d445f4a7df0a26d7805584ac4d5939b178a30062 Mon Sep 17 00:00:00 2001
From dcf936f4a58a869b127053dbface4407d90ba15b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 1 Aug 2019 19:15:12 -0500
Subject: [PATCH] Add blacklist option for grindstone
@@ -10,7 +10,7 @@ Subject: [PATCH] Add blacklist option for grindstone
3 files changed, 35 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
index ed88e208d0..fcfb4abdc2 100644
index ed88e208d..fcfb4abdc 100644
--- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
+++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
@@ -57,12 +57,24 @@ public class ContainerGrindstone extends Container {
@@ -51,7 +51,7 @@ index ed88e208d0..fcfb4abdc2 100644
Map<Enchantment, Integer> map = EnchantmentManager.a(itemstack);
Iterator iterator = map.entrySet().iterator();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 8c3bbef666..d5e0578b25 100644
index 8c3bbef66..d5e0578b2 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -542,6 +542,12 @@ public final class ItemStack {
@@ -68,7 +68,7 @@ index 8c3bbef666..d5e0578b25 100644
return this.getItem().f(this);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5318a8e327..9c60855d66 100644
index 5318a8e32..9c60855d6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey;
@@ -98,5 +98,5 @@ index 5318a8e327..9c60855d66 100644
public boolean signRightClickEdit = false;
private void signSettings() {
--
2.24.0
2.26.2

12
patches/server/0048-Implement-lagging-threshold.patch → patches/server/0049-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From c123113f0058050b2ff23ae630699d0a9c03bdf2 Mon Sep 17 00:00:00 2001
From 227bedf9b854210d5b7cd9408ca62f7547ff0170 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] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
3 files changed, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 447e9ea4ec..60f8b60e4c 100644
index da8c98356..3568e076e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -28,9 +28,9 @@ index 447e9ea4ec..60f8b60e4c 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 d3e1c8c407..ab20fa2fae 100644
index d3e1c8c40..ab20fa2fa 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig {
@@ -46,10 +46,10 @@ index d3e1c8c407..ab20fa2fae 100644
private static void dontSendUselessEntityPackets() {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2293a5dd8d..63d17f6a7c 100644
index e3a012800..97159dfe1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2286,4 +2286,11 @@ public final class CraftServer implements Server {
@@ -2299,4 +2299,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end

8
patches/server/0049-Implement-configurable-villager-brain-ticks.patch → patches/server/0050-Implement-configurable-villager-brain-ticks.patch
View File

@@ -1,4 +1,4 @@
From c7c80f357a335240d763c8f9a0306e2541d151e3 Mon Sep 17 00:00:00 2001
From d24813dc8ea3cdfc744c0cf5c9a0e50e6e0ca301 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 08:28:21 -0500
Subject: [PATCH] Implement configurable villager brain ticks
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
2 files changed, 10 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 5b0de0d9d8..843f22260b 100644
index 5b0de0d9d..843f22260 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -53,6 +53,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -40,7 +40,7 @@ index 5b0de0d9d8..843f22260b 100644
this.world.getMethodProfiler().exit();
if (!this.et() && this.bB > 0) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9c60855d66..f1ed653b3a 100644
index 9c60855d6..f1ed653b3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -737,10 +737,14 @@ public class PurpurWorldConfig {
@@ -59,5 +59,5 @@ index 9c60855d66..f1ed653b3a 100644
public boolean villagerTraderRidable = false;
--
2.24.0
2.26.2

8
patches/server/0050-Add-option-for-zombies-targetting-turtle-eggs.patch → patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From d096e6768ecf1714afac203d91cb4b0609e7ae90 Mon Sep 17 00:00:00 2001
From 89e2ea5817f0cde07833d0f18aecc3fe3ff51a3b 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for zombies targetting turtle eggs
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 8d1f04415e..95ae6f3494 100644
index 8d1f04415..95ae6f349 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -64,7 +64,7 @@ public class EntityZombie extends EntityMonster {
@@ -22,7 +22,7 @@ index 8d1f04415e..95ae6f3494 100644
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f1ed653b3a..114cd3f808 100644
index f1ed653b3..114cd3f80 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -806,10 +806,12 @@ public class PurpurWorldConfig {
@@ -39,5 +39,5 @@ index f1ed653b3a..114cd3f808 100644
public boolean zombieHorseCanSwim = false;
--
2.24.0
2.26.2

8
patches/server/0051-Implement-bamboo-growth-settings.patch → patches/server/0052-Implement-bamboo-growth-settings.patch
View File

@@ -1,4 +1,4 @@
From 6653c569a030023fcef774eb65bd80e36c5380fe Mon Sep 17 00:00:00 2001
From 1a9676ebff9a4a1dc9b6127c2adff3d42f1dbcad 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bamboo growth settings
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockBamboo.java b/src/main/java/net/minecraft/server/BlockBamboo.java
index 02c548dd9c..016ceebb9d 100644
index 02c548dd9..016ceebb9 100644
--- a/src/main/java/net/minecraft/server/BlockBamboo.java
+++ b/src/main/java/net/minecraft/server/BlockBamboo.java
@@ -10,7 +10,7 @@ public class BlockBamboo extends Block implements IBlockFragilePlantElement {
@@ -76,7 +76,7 @@ index 02c548dd9c..016ceebb9d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 114cd3f808..61c19661c3 100644
index 114cd3f80..61c19661c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -72,6 +72,13 @@ public class PurpurWorldConfig {
@@ -94,5 +94,5 @@ index 114cd3f808..61c19661c3 100644
public int campfireRegenDuration = 80;
public int campfireRegenRange = 5;
--
2.24.0
2.26.2

42
patches/server/0052-Climbing-should-not-bypass-cramming-gamerule.patch → patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 1f7d701d09511913123d84fabb0e93c65b92352c Mon Sep 17 00:00:00 2001
From 8ae63e002d53063369985ba2da34b6a6723b13eb 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
@@ -17,10 +17,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 39bd34ab34..ce0821a656 100644
index bdf79302b..92b77ce34 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1573,6 +1573,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1758,6 +1758,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -34,7 +34,7 @@ index 39bd34ab34..ce0821a656 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index d35a0b2d94..d4aa9b24f7 100644
index d35a0b2d9..d4aa9b24f 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -47,7 +47,7 @@ index d35a0b2d94..d4aa9b24f7 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 592408bac9..7a740f6768 100644
index 592408bac..7a740f676 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -85,7 +85,7 @@ public class EntityBat extends EntityAmbient {
@@ -60,7 +60,7 @@ index 592408bac9..7a740f6768 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index fdf306e80a..563fc8ced0 100644
index fdf306e80..563fc8ced 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -73,7 +73,7 @@ index fdf306e80a..563fc8ced0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index f31cb05542..0ecdea6710 100644
index f31cb0554..0ecdea671 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -181,7 +181,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -86,19 +86,19 @@ index f31cb05542..0ecdea6710 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c1cc24cf11..0f8ba92a84 100644
index 677c2dc4f..288942e9d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2692,7 +2692,7 @@ public abstract class EntityLiving extends Entity {
return;
}
@@ -2694,7 +2694,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); // Purpur
try {
// Tuinity end - reduce memory allocation from collideNearby
if (!list.isEmpty()) {
// Paper - move up
@@ -2830,8 +2830,10 @@ public abstract class EntityLiving extends Entity {
@@ -2837,8 +2837,10 @@ public abstract class EntityLiving extends Entity {
}
@Override
@@ -112,7 +112,7 @@ index c1cc24cf11..0f8ba92a84 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 1f3e5bd288..ae4758f251 100644
index 1f3e5bd28..ae4758f25 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -105,7 +105,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -125,7 +125,7 @@ index 1f3e5bd288..ae4758f251 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 7ba2f3a351..dd2cd7b219 100644
index 7ba2f3a35..dd2cd7b21 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -392,7 +392,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -138,7 +138,7 @@ index 7ba2f3a351..dd2cd7b219 100644
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 0bf1a14b7c..9f5860ca8b 100644
index 0bf1a14b7..9f5860ca8 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -36,11 +36,17 @@ public final class IEntitySelector {
@@ -161,7 +161,7 @@ index 0bf1a14b7c..9f5860ca8b 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 61c19661c3..1a2512b528 100644
index 61c19661c..1a2512b52 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -136,6 +136,7 @@ public class PurpurWorldConfig {
@@ -181,5 +181,5 @@ index 61c19661c3..1a2512b528 100644
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
}
--
2.24.0
2.26.2

12
patches/server/0053-Option-for-slimes-not-pushable.patch → patches/server/0054-Option-for-slimes-not-pushable.patch
View File

@@ -1,4 +1,4 @@
From 1897ed89852ab0037f27f345b3f908c8cfff0e3d Mon Sep 17 00:00:00 2001
From 9b4138db851b38e9c42ecd40ede122f9b75f2ce1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 23 Aug 2019 21:56:31 -0500
Subject: [PATCH] Option for slimes not pushable
@@ -10,10 +10,10 @@ Subject: [PATCH] Option for slimes not pushable
3 files changed, 22 insertions(+)
diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
index b29525c40d..1e72b3bbc5 100644
index 8312ed779..a1721c63d 100644
--- a/src/main/java/net/minecraft/server/BlockPiston.java
+++ b/src/main/java/net/minecraft/server/BlockPiston.java
@@ -332,6 +332,16 @@ public class BlockPiston extends BlockDirectional {
@@ -347,6 +347,16 @@ public class BlockPiston extends BlockDirectional {
} else {
event = new BlockPistonRetractEvent(bblock, blocks, CraftBlock.notchToBlockFace(enumdirection1));
}
@@ -31,7 +31,7 @@ index b29525c40d..1e72b3bbc5 100644
if (event.isCancelled()) {
diff --git a/src/main/java/net/minecraft/server/BlockSlime.java b/src/main/java/net/minecraft/server/BlockSlime.java
index 01f32659d9..52ab86f0b1 100644
index 01f32659d..52ab86f0b 100644
--- a/src/main/java/net/minecraft/server/BlockSlime.java
+++ b/src/main/java/net/minecraft/server/BlockSlime.java
@@ -49,4 +49,11 @@ public class BlockSlime extends BlockHalfTransparent {
@@ -47,7 +47,7 @@ index 01f32659d9..52ab86f0b1 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ab20fa2fae..72ad9dce7d 100644
index ab20fa2fa..72ad9dce7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig {
@@ -63,5 +63,5 @@ index ab20fa2fae..72ad9dce7d 100644
getString("settings.timings.url", "https://timings.pl3x.net");
}
--
2.24.0
2.26.2

10
patches/server/0054-Bring-back-server-name.patch → patches/server/0055-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From e82128bc8f0e4381e117ea7d5546b7afd661791c Mon Sep 17 00:00:00 2001
From 1ff4358c48066bbe6694b68332dd8a7c3088a4bf 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
2 files changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
index 0c3ec83570..309f5562b8 100644
index 0c3ec8357..309f5562b 100644
--- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
+++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
@@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -21,10 +21,10 @@ index 0c3ec83570..309f5562b8 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 e890a1f815..b488d18486 100644
index 97159dfe1..0483ec062 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2288,6 +2288,11 @@ public final class CraftServer implements Server {
@@ -2301,6 +2301,11 @@ public final class CraftServer implements Server {
// Paper end
// Purpur start
@@ -37,5 +37,5 @@ index e890a1f815..b488d18486 100644
public boolean isLagging() {
return getServer().lagging;
--
2.24.0
2.26.2

10
patches/server/0055-Dispenser-curse-of-binding-protection.patch → patches/server/0056-Dispenser-curse-of-binding-protection.patch
View File

@@ -1,4 +1,4 @@
From 3ba680a8a7fb7db101ca8b54a7e26eff2193d0f5 Mon Sep 17 00:00:00 2001
From dd5ff2d86f41eba0265941c0834215f86d9b9606 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Dispenser curse of binding protection
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index fbca429090..bf9d044b0b 100644
index fbca42909..bf9d044b0 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -913,6 +913,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -28,7 +28,7 @@ index fbca429090..bf9d044b0b 100644
Item item = itemstack.getItem();
diff --git a/src/main/java/net/minecraft/server/ItemArmor.java b/src/main/java/net/minecraft/server/ItemArmor.java
index df8c42bfbd..a4b3d0c298 100644
index df8c42bfb..a4b3d0c29 100644
--- a/src/main/java/net/minecraft/server/ItemArmor.java
+++ b/src/main/java/net/minecraft/server/ItemArmor.java
@@ -31,7 +31,7 @@ public class ItemArmor extends Item {
@@ -49,7 +49,7 @@ index df8c42bfbd..a4b3d0c298 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 1a2512b528..b8754ba2d2 100644
index 1a2512b52..b8754ba2d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -106,6 +106,11 @@ public class PurpurWorldConfig {
@@ -65,5 +65,5 @@ index 1a2512b528..b8754ba2d2 100644
private void farmlandSettings() {
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
--
2.24.0
2.26.2

12
patches/server/0056-Implement-LivingEntity-safeFallDistance.patch → patches/server/0057-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From 5b5ba5db23982d2d32640b026f8e837318a7a5fd Mon Sep 17 00:00:00 2001
From 7922b68914319be86e725f89951217ee05ab2b59 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] Implement LivingEntity safeFallDistance
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index 4296aaa074..a2e3e60012 100644
index 4296aaa07..a2e3e6001 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -5,6 +5,9 @@ public class EntityGiantZombie extends EntityMonster {
@@ -25,7 +25,7 @@ index 4296aaa074..a2e3e60012 100644
// Purpur start
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 0ecdea6710..e099ef9a06 100644
index 0ecdea671..e099ef9a0 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -222,7 +222,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -38,7 +38,7 @@ index 0ecdea6710..e099ef9a06 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 0f8ba92a84..d6751e3cce 100644
index 288942e9d..28e555d6e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -125,6 +125,7 @@ public abstract class EntityLiving extends Entity {
@@ -59,7 +59,7 @@ index 0f8ba92a84..d6751e3cce 100644
protected void cZ() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index a461ac3614..4874c2242f 100644
index a461ac361..4874c2242 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -739,4 +739,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -80,5 +80,5 @@ index a461ac3614..4874c2242f 100644
+ // Purpur end
}
--
2.24.0
2.26.2

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

@@ -1,4 +1,4 @@
From 160daef535fc94a099255c2f409c92028bcee7e7 Mon Sep 17 00:00:00 2001
From c42c2b9207be73a2feed8fa32b321cc9a1ffc1ce 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option for boats to eject players on land
2 files changed, 3 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 563fc8ced0..479ed7c7bc 100644
index 563fc8ced..479ed7c7b 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -431,6 +431,7 @@ public class EntityBoat extends Entity {
@@ -21,7 +21,7 @@ index 563fc8ced0..479ed7c7bc 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 b8754ba2d2..2271d13f11 100644
index b8754ba2d..2271d13f1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -134,6 +134,7 @@ public class PurpurWorldConfig {
@@ -41,5 +41,5 @@ index b8754ba2d2..2271d13f11 100644
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
controllableMinecartsStepHeight = (float) getDouble("gameplay-mechanics.controllable-minecarts.step-height", controllableMinecartsStepHeight);
--
2.24.0
2.26.2

16
patches/server/0058-Advancement-API-Additions.patch → patches/server/0059-Advancement-API-Additions.patch
View File

@@ -1,4 +1,4 @@
From a85e45062879867543939848629375d400158d31 Mon Sep 17 00:00:00 2001
From 334b15abb698261d55af562dca76653a34cac4a9 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 Additions
@@ -14,7 +14,7 @@ Subject: [PATCH] Advancement API Additions
create mode 100644 src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
diff --git a/src/main/java/net/minecraft/server/Advancement.java b/src/main/java/net/minecraft/server/Advancement.java
index 4b85551faf..4cba4187a0 100644
index 4b85551fa..4cba4187a 100644
--- a/src/main/java/net/minecraft/server/Advancement.java
+++ b/src/main/java/net/minecraft/server/Advancement.java
@@ -65,7 +65,7 @@ public class Advancement {
@@ -27,7 +27,7 @@ index 4b85551faf..4cba4187a0 100644
}
diff --git a/src/main/java/net/minecraft/server/AdvancementDisplay.java b/src/main/java/net/minecraft/server/AdvancementDisplay.java
index e8172d56fe..976c85ef1b 100644
index e8172d56f..976c85ef1 100644
--- a/src/main/java/net/minecraft/server/AdvancementDisplay.java
+++ b/src/main/java/net/minecraft/server/AdvancementDisplay.java
@@ -16,10 +16,11 @@ public class AdvancementDisplay {
@@ -75,7 +75,7 @@ index e8172d56fe..976c85ef1b 100644
return this.h;
}
diff --git a/src/main/java/net/minecraft/server/AdvancementFrameType.java b/src/main/java/net/minecraft/server/AdvancementFrameType.java
index a9c49a4348..551a845476 100644
index a9c49a434..551a84547 100644
--- a/src/main/java/net/minecraft/server/AdvancementFrameType.java
+++ b/src/main/java/net/minecraft/server/AdvancementFrameType.java
@@ -1,14 +1,25 @@
@@ -107,7 +107,7 @@ index a9c49a4348..551a845476 100644
this.e = i;
this.f = enumchatformat;
diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java
index 4fe7324475..6e5d81daf1 100644
index 4fe732447..6e5d81daf 100644
--- a/src/main/java/net/minecraft/server/CriterionTrigger.java
+++ b/src/main/java/net/minecraft/server/CriterionTrigger.java
@@ -27,6 +27,7 @@ public interface CriterionTrigger<T extends CriterionInstance> {
@@ -119,7 +119,7 @@ index 4fe7324475..6e5d81daf1 100644
return this.a;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
index a5aadf2850..b0a7092d62 100644
index a5aadf285..b0a7092d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java
@@ -27,4 +27,11 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement {
@@ -136,7 +136,7 @@ index a5aadf2850..b0a7092d62 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
new file mode 100644
index 0000000000..1cbb1e67b6
index 000000000..1cbb1e67b
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancementDisplay.java
@@ -0,0 +1,47 @@
@@ -188,5 +188,5 @@ index 0000000000..1cbb1e67b6
+ }
+}
--
2.24.0
2.26.2

8
patches/server/0059-Add-option-to-set-armorstand-step-height.patch → patches/server/0060-Add-option-to-set-armorstand-step-height.patch
View File

@@ -1,4 +1,4 @@
From 2566c488642ec8177cda2802bc760f30dccdaa37 Mon Sep 17 00:00:00 2001
From 4536501e5239e68ff4e8bebc65bed6fb08b96284 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to set armorstand step height
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index d4aa9b24f7..d655449534 100644
index d4aa9b24f..d65544953 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -62,7 +62,6 @@ public class EntityArmorStand extends EntityLiving {
@@ -29,7 +29,7 @@ index d4aa9b24f7..d655449534 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 2271d13f11..4bb5ddea44 100644
index 2271d13f1..4bb5ddea4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -135,6 +135,7 @@ public class PurpurWorldConfig {
@@ -49,5 +49,5 @@ index 2271d13f11..4bb5ddea44 100644
controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
controllableMinecartsStepHeight = (float) getDouble("gameplay-mechanics.controllable-minecarts.step-height", controllableMinecartsStepHeight);
--
2.24.0
2.26.2

8
patches/server/0060-Implement-ItemFactory-getMonsterEgg.patch → patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch
View File

@@ -1,4 +1,4 @@
From 271dc5e77dee7646380eb8b909e5570731ba83cf Mon Sep 17 00:00:00 2001
From 061042c1a14095bb5264328ecf40c63c20212dd6 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] Implement ItemFactory#getMonsterEgg
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement ItemFactory#getMonsterEgg
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
index 24af4c11d6..8ef2c32236 100644
index 24af4c11d..8ef2c3223 100644
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
@@ -22,7 +22,7 @@ index 24af4c11d6..8ef2c32236 100644
private final int c;
private final EntityTypes<?> d;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 23d7756456..29161032c3 100644
index 23d775645..29161032c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -354,4 +354,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -45,5 +45,5 @@ index 23d7756456..29161032c3 100644
+ // Purpur end
}
--
2.24.0
2.26.2

10
patches/server/0061-Alternative-Keepalive-Handling.patch → patches/server/0062-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From 289e82a07dfc2238298bbc0d81819d1f57b55628 Mon Sep 17 00:00:00 2001
From 23e176a46b1214496ce22866fd08e1aecae26a22 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Alternative Keepalive Handling
3 files changed, 33 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
index 8e93f1540b..470f92c4fb 100644
index 8e93f1540..470f92c4f 100644
--- a/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
+++ b/src/main/java/net/minecraft/server/PacketPlayInKeepAlive.java
@@ -22,6 +22,7 @@ public class PacketPlayInKeepAlive implements Packet<PacketListenerPlayIn> {
@@ -22,7 +22,7 @@ index 8e93f1540b..470f92c4fb 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 57e8c22d05..80a75912fb 100644
index 09cab5a99..6f7fd0f64 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 57e8c22d05..80a75912fb 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
@@ -2660,6 +2676,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2677,6 +2693,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
@@ -74,7 +74,7 @@ index 57e8c22d05..80a75912fb 100644
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 72ad9dce7d..ed2a312773 100644
index 72ad9dce7..ed2a31277 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -144,6 +144,11 @@ public class PurpurConfig {

6
patches/server/0062-Implement-PlayerSetSpawnerTypeWithEggEvent.patch → patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -1,4 +1,4 @@
From f7c3b76fd6493e7e4105d8a3da92f101f60c0187 Mon Sep 17 00:00:00 2001
From dc386a10b38cdbe4de2d942d8e70138b7bf593f5 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] Implement PlayerSetSpawnerTypeWithEggEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
1 file changed, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
index 8ef2c32236..237fdeda5c 100644
index 8ef2c3223..237fdeda5 100644
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
@@ -2,6 +2,11 @@ package net.minecraft.server;
@@ -40,5 +40,5 @@ index 8ef2c32236..237fdeda5c 100644
tileentity.update();
world.notify(blockposition, iblockdata, iblockdata, 3);
--
2.24.0
2.26.2

6
patches/server/0063-Add-moon-phase-API.patch → patches/server/0064-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 04e2a3750f02b48b1370cf8fcf25a2da357f8aa4 Mon Sep 17 00:00:00 2001
From 93a93b6f297d5f1bd55db507d44b7b0263d8852c 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] Add moon phase API
@@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f4a1be34f0..1913b31bc1 100644
index 1ee5ce50b..eb8571c30 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2477,6 +2477,14 @@ public class CraftWorld implements World {
@@ -2478,6 +2478,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

12
patches/server/0064-Add-getPlacementBlockData-to-World.patch → patches/server/0065-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From b14da6ddd0633bf5359c178fb6610347e0ef6baf Mon Sep 17 00:00:00 2001
From 5ae31d323f96470ac6ba7a31996cada392449d6c 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] Add getPlacementBlockData to World
@@ -12,7 +12,7 @@ Subject: [PATCH] Add getPlacementBlockData to World
create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java
diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
index 69d04f6cbf..901d45f284 100644
index 69d04f6cb..901d45f28 100644
--- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
+++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
@@ -57,6 +57,7 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -25,7 +25,7 @@ index 69d04f6cbf..901d45f284 100644
return i;
diff --git a/src/main/java/net/minecraft/server/ItemSpawner.java b/src/main/java/net/minecraft/server/ItemSpawner.java
new file mode 100644
index 0000000000..7dc68ffe92
index 000000000..7dc68ffe9
--- /dev/null
+++ b/src/main/java/net/minecraft/server/ItemSpawner.java
@@ -0,0 +1,23 @@
@@ -53,7 +53,7 @@ index 0000000000..7dc68ffe92
+ }
+}
diff --git a/src/main/java/net/minecraft/server/Items.java b/src/main/java/net/minecraft/server/Items.java
index 9c9b93f280..74a722cce5 100644
index 9c9b93f28..74a722cce 100644
--- a/src/main/java/net/minecraft/server/Items.java
+++ b/src/main/java/net/minecraft/server/Items.java
@@ -155,7 +155,7 @@ public class Items {
@@ -66,10 +66,10 @@ index 9c9b93f280..74a722cce5 100644
public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1913b31bc1..82960af87d 100644
index eb8571c30..3d27028e8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2483,6 +2483,11 @@ public class CraftWorld implements World {
@@ -2484,6 +2484,11 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}

10
patches/server/0065-Barrels-have-6-rows.patch → patches/server/0066-Barrels-have-6-rows.patch
View File

@@ -1,4 +1,4 @@
From d699dd8a2b720e6e0347e104b319cf7d071e6277 Mon Sep 17 00:00:00 2001
From bdd2fd8f778a66a3f234c7ad24dba470f2f1d0a3 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 have 6 rows
@@ -10,7 +10,7 @@ Subject: [PATCH] Barrels have 6 rows
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/TileEntityBarrel.java b/src/main/java/net/minecraft/server/TileEntityBarrel.java
index 1e27abbea0..ca3b6c9aae 100644
index 1e27abbea..ca3b6c9aa 100644
--- a/src/main/java/net/minecraft/server/TileEntityBarrel.java
+++ b/src/main/java/net/minecraft/server/TileEntityBarrel.java
@@ -54,7 +54,7 @@ public class TileEntityBarrel extends TileEntityLootable {
@@ -40,7 +40,7 @@ index 1e27abbea0..ca3b6c9aae 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index ed2a312773..581e8eebe7 100644
index ed2a31277..581e8eebe 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
@@ -69,7 +69,7 @@ index ed2a312773..581e8eebe7 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index 454ec3c76e..d295821c57 100644
index 454ec3c76..d295821c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -195,8 +195,10 @@ public class CraftContainer extends Container {
@@ -85,5 +85,5 @@ index 454ec3c76e..d295821c57 100644
case DISPENSER:
case DROPPER:
--
2.24.0
2.26.2

16
patches/server/0066-Enderchest-6-rows-plus-permissions.patch → patches/server/0067-Enderchest-6-rows-plus-permissions.patch
View File

@@ -1,4 +1,4 @@
From c40ba4d5095176ca9829df4cb2fd01b230253093 Mon Sep 17 00:00:00 2001
From a45c6a3ab3401040e7ab6a00de1f3c847e183dc6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 23 Jun 2019 17:01:26 -0500
Subject: [PATCH] Enderchest 6 rows (plus permissions)
@@ -13,7 +13,7 @@ Subject: [PATCH] Enderchest 6 rows (plus permissions)
6 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockEnderChest.java b/src/main/java/net/minecraft/server/BlockEnderChest.java
index 0a892a5f1a..e7ef571dc5 100644
index 0a892a5f1..e7ef571dc 100644
--- a/src/main/java/net/minecraft/server/BlockEnderChest.java
+++ b/src/main/java/net/minecraft/server/BlockEnderChest.java
@@ -48,6 +48,27 @@ public class BlockEnderChest extends BlockChestAbstract<TileEntityEnderChest> im
@@ -45,7 +45,7 @@ index 0a892a5f1a..e7ef571dc5 100644
}, BlockEnderChest.e));
entityhuman.a(StatisticList.OPEN_ENDERCHEST);
diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
index fd31b9a6dc..903c02e9ef 100644
index fd31b9a6d..903c02e9e 100644
--- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
+++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
@@ -20,7 +20,7 @@ public class InventoryEnderChest extends InventorySubcontainer {
@@ -58,7 +58,7 @@ index fd31b9a6dc..903c02e9ef 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 581e8eebe7..c3ecd6fc70 100644
index 581e8eebe..c3ecd6fc7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -157,14 +157,22 @@ public class PurpurConfig {
@@ -85,7 +85,7 @@ index 581e8eebe7..c3ecd6fc70 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
index d295821c57..610cbbe858 100644
index d295821c5..610cbbe85 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
@@ -195,7 +195,7 @@ public class CraftContainer extends Container {
@@ -98,7 +98,7 @@ index d295821c57..610cbbe858 100644
case BARREL:
delegate = new ContainerChest(net.pl3x.purpur.PurpurConfig.barrelSixRows ? Containers.GENERIC_9X6 : Containers.GENERIC_9X3, windowId, bottom, top, top.getSize() / 9); // Purpur
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
index 47827fbf1b..0f5819a409 100644
index 57858327a..d57ad13f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -81,7 +81,7 @@ public class CraftInventory implements Inventory {
@@ -111,7 +111,7 @@ index 47827fbf1b..0f5819a409 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
index a4a809f302..e7d19d67c9 100644
index a4a809f30..e7d19d67c 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
@@ -18,6 +18,14 @@ public final class CraftDefaultPermissions {
@@ -130,5 +130,5 @@ index a4a809f302..e7d19d67c9 100644
}
}
--
2.24.0
2.26.2

10
patches/server/0067-Add-5-second-tps-average-in-tps.patch → patches/server/0068-Add-5-second-tps-average-in-tps.patch
View File

@@ -1,4 +1,4 @@
From 6482469cb0a1a9440a426fa0ecb348499014c7a3 Mon Sep 17 00:00:00 2001
From e803339774dfdcd4aa5f27f6dcb231bd5932704b 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 60f8b60e4c..81422ab15a 100644
index 3568e076e..f23fdd5f2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -183,7 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,10 +52,10 @@ index 60f8b60e4c..81422ab15a 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 503d3bba20..434ac4d23a 100644
index 0483ec062..12789ba6e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2092,6 +2092,7 @@ public final class CraftServer implements Server {
@@ -2097,6 +2097,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {
@@ -64,7 +64,7 @@ index 503d3bba20..434ac4d23a 100644
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 387af9d5c0..650f74ba3e 100644
index 387af9d5c..650f74ba3 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -30,7 +30,7 @@ public class TicksPerSecondCommand extends Command

6
patches/server/0068-Add-playPickupItemAnimation-to-LivingEntity.patch → patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch
View File

@@ -1,4 +1,4 @@
From 3485939d0379b4d6a547046d14e2fa817b8286f6 Mon Sep 17 00:00:00 2001
From 8d2281f398ecd5a18ce82bbe36815336b45564ca 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] Add playPickupItemAnimation to LivingEntity
@@ -8,7 +8,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 4874c2242f..d8207b3221 100644
index 4874c2242..d8207b322 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -750,5 +750,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -23,5 +23,5 @@ index 4874c2242f..d8207b3221 100644
// Purpur end
}
--
2.24.0
2.26.2

8
patches/server/0069-Add-more-evoker-API.patch → patches/server/0070-Add-more-evoker-API.patch
View File

@@ -1,4 +1,4 @@
From f1e55c375cfbb848f5c9c28fee325ef31fdc88cc Mon Sep 17 00:00:00 2001
From 4f5ad157197bfb5a3447e104eb705317f82b935a 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] Add more evoker API
@@ -9,7 +9,7 @@ Subject: [PATCH] Add more evoker API
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
index 179a261296..e7d0d0f5e3 100644
index 179a26129..e7d0d0f5e 100644
--- a/src/main/java/net/minecraft/server/EntityEvoker.java
+++ b/src/main/java/net/minecraft/server/EntityEvoker.java
@@ -102,12 +102,14 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -30,7 +30,7 @@ index 179a261296..e7d0d0f5e3 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
index 0636d26473..4ccb938909 100644
index 0636d2647..4ccb93890 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
@@ -36,4 +36,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
@@ -52,5 +52,5 @@ index 0636d26473..4ccb938909 100644
+ // Purpur end
}
--
2.24.0
2.26.2

12
patches/server/0070-Add-API-for-Villager-resetOffers.patch → patches/server/0071-Add-API-for-Villager-resetOffers.patch
View File

@@ -1,4 +1,4 @@
From 3186ae96aa6c7d86c23f409de90bdcd99030f179 Mon Sep 17 00:00:00 2001
From f47732a9410ca8fffaa03331ac3deb642af7e1ed 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] Add API for Villager#resetOffers()
@@ -9,7 +9,7 @@ Subject: [PATCH] Add API for Villager#resetOffers()
2 files changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index 4635285320..5fbd13512f 100644
index 463528532..5fbd13512 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -84,6 +84,13 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
@@ -35,11 +35,11 @@ index 4635285320..5fbd13512f 100644
protected void a(MerchantRecipeList merchantrecipelist, VillagerTrades.IMerchantRecipeOption[] avillagertrades_imerchantrecipeoption, int i) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
index 19409c7a25..d9e19648ff 100644
index d24a892c4..abfa6340f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
@@ -164,4 +164,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
}
@@ -169,4 +169,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
getHandle().getReputation().getReputations().clear();
}
// Paper end
+
@@ -51,5 +51,5 @@ index 19409c7a25..d9e19648ff 100644
+ // Purpur end
}
--
2.24.0
2.26.2

10
patches/server/0071-Add-more-llama-API.patch → patches/server/0072-Add-more-llama-API.patch
View File

@@ -1,4 +1,4 @@
From e73d8edd323159d1d7d36b0ea0b512ed93f86d42 Mon Sep 17 00:00:00 2001
From eab02ae8ebe093cfce94311b02c3c76349add5bd 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] Add more llama API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add more llama API
3 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index c5f87cbdd2..082aac258e 100644
index c5f87cbdd..082aac258 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -80,7 +80,7 @@ index c5f87cbdd2..082aac258e 100644
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
index e181d83505..8376f1dc4e 100644
index e181d8350..8376f1dc4 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
@@ -6,7 +6,7 @@ import java.util.List;
@@ -109,7 +109,7 @@ index e181d83505..8376f1dc4e 100644
double d0 = this.a.h((Entity) this.a.fe());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
index 3f94c5a920..a027634801 100644
index 3f94c5a92..a02763480 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
@@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE
@@ -162,5 +162,5 @@ index 3f94c5a920..a027634801 100644
+ // Purpur end
}
--
2.24.0
2.26.2

8
patches/server/0072-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch → patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
View File

@@ -1,4 +1,4 @@
From 15ac10c2b91503b47285be76744115eff2e5e5ca Mon Sep 17 00:00:00 2001
From 2773516386b1b074024a5129b2dac38d1d1d0ec9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 03:36:52 -0500
Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index d5432bfeb7..91ef7ac60f 100644
index 7d50b7056..c5e643292 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -291,8 +291,10 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -307,8 +307,10 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
}
if (this.isBurning() && this.canBurn(irecipe)) {
@@ -26,5 +26,5 @@ index d5432bfeb7..91ef7ac60f 100644
this.cookTimeTotal = this.getRecipeCookingTime();
this.burn(irecipe);
--
2.24.0
2.26.2

12
patches/server/0073-Implement-infinite-lava.patch → patches/server/0074-Implement-infinite-lava.patch
View File

@@ -1,4 +1,4 @@
From 4332d7e3f964bec57c37c29485fc30c5c8e27972 Mon Sep 17 00:00:00 2001
From c4409a74149d47ea97ddf49b1f235070b46c3208 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement infinite lava
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
index 376dca1889..1a14fe4a24 100644
index 376dca188..1a14fe4a2 100644
--- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
+++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
@@ -219,7 +219,7 @@ public abstract class FluidTypeFlowing extends FluidType {
@@ -39,7 +39,7 @@ index 376dca1889..1a14fe4a24 100644
protected void a(GeneratorAccess generatoraccess, BlockPosition blockposition, IBlockData iblockdata, EnumDirection enumdirection, Fluid fluid) {
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
index d25368d032..09f82c2d92 100644
index d25368d03..09f82c2d9 100644
--- a/src/main/java/net/minecraft/server/FluidTypeLava.java
+++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
@@ -147,6 +147,13 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -57,7 +57,7 @@ index d25368d032..09f82c2d92 100644
protected boolean f() {
return false;
diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
index 9eba9a12c0..39252e6873 100644
index 9eba9a12c..39252e687 100644
--- a/src/main/java/net/minecraft/server/WorldProvider.java
+++ b/src/main/java/net/minecraft/server/WorldProvider.java
@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -70,7 +70,7 @@ index 9eba9a12c0..39252e6873 100644
protected boolean c;
protected boolean d;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4bb5ddea44..5b042a6098 100644
index 4bb5ddea4..5b042a609 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
@@ -86,5 +86,5 @@ index 4bb5ddea44..5b042a6098 100644
public boolean signRightClickEdit = false;
private void signSettings() {
--
2.24.0
2.26.2

8
patches/server/0074-Expose-getItemStack-for-Trident.patch → patches/server/0075-Expose-getItemStack-for-Trident.patch
View File

@@ -1,4 +1,4 @@
From 1aa60ccb54ba04884e1d3f0a1f911049e79be5eb Mon Sep 17 00:00:00 2001
From e10b674179217a0cabe811dd22d96dd28dcec896 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:19:40 -0500
Subject: [PATCH] Expose getItemStack for Trident
@@ -9,7 +9,7 @@ Subject: [PATCH] Expose getItemStack for Trident
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
index 59bb039ad7..ed8e26aa45 100644
index 59bb039ad..ed8e26aa4 100644
--- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
@@ -77,7 +77,7 @@ public class EntityThrownTrident extends EntityArrow {
@@ -22,7 +22,7 @@ index 59bb039ad7..ed8e26aa45 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
index 0518e6c683..63287a9b65 100644
index 0518e6c68..63287a9b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java
@@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident {
@@ -38,5 +38,5 @@ index 0518e6c683..63287a9b65 100644
+ // Purpur end
}
--
2.24.0
2.26.2

8
patches/server/0075-Despawn-egg-hatches-chicken.patch → patches/server/0076-Despawn-egg-hatches-chicken.patch
View File

@@ -1,4 +1,4 @@
From afadc70dec5429c8b819d659687f20feb6bc0f6c Mon Sep 17 00:00:00 2001
From d425a077b293b1e4368c321ba44314711eb2a6e1 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 23:47:42 -0600
Subject: [PATCH] Despawn egg hatches chicken
@@ -9,7 +9,7 @@ Subject: [PATCH] Despawn egg hatches chicken
2 files changed, 25 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 2926fbb957..bbb9ca1efc 100644
index 2926fbb95..bbb9ca1ef 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -165,6 +165,27 @@ public class EntityItem extends Entity {
@@ -41,7 +41,7 @@ index 2926fbb957..bbb9ca1efc 100644
Vec3D vec3d = this.getMot();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5b042a6098..647bece31f 100644
index 5b042a609..647bece31 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -262,11 +262,15 @@ public class PurpurWorldConfig {
@@ -61,5 +61,5 @@ index 5b042a6098..647bece31f 100644
public boolean codRidable = false;
--
2.24.0
2.26.2

12
patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch → patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View File

@@ -1,4 +1,4 @@
From e1db66a264e8af597da193a69805291c90b56df5 Mon Sep 17 00:00:00 2001
From 9bebb70c4071f92b1317115e42b71ef628ee5631 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 01:42:50 -0500
Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d2fac7f296..838fc97843 100644
index ad3b81a11..b24191d81 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1437,8 +1437,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1472,8 +1472,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return blockposition;
}
@@ -25,10 +25,10 @@ index d2fac7f296..838fc97843 100644
public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 414fc4baf9..e54cff571c 100644
index 3d27028e8..85922aaa9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -384,12 +384,16 @@ public class CraftWorld implements World {
@@ -391,12 +391,16 @@ public class CraftWorld implements World {
@Override
public boolean setSpawnLocation(int x, int y, int z) {
try {
@@ -50,5 +50,5 @@ index 414fc4baf9..e54cff571c 100644
return true;
} catch (Exception e) {
--
2.24.0
2.26.2

8
patches/server/0077-Add-sleep-options.patch → patches/server/0078-Add-sleep-options.patch
View File

@@ -1,4 +1,4 @@
From 19d0ab926c3370693cc732613d287e0160eac56e Mon Sep 17 00:00:00 2001
From 0f863a2f9ef019645eaf659efc0fbdd135caef40 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 30 Nov 2019 03:30:17 -0600
Subject: [PATCH] Add sleep options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index d62174e9c7..22e17e3de3 100644
index d62174e9c..22e17e3de 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -143,6 +143,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -53,7 +53,7 @@ index d62174e9c7..22e17e3de3 100644
return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 647bece31f..08fb0bae3a 100644
index 647bece31..08fb0bae3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -150,6 +150,8 @@ public class PurpurWorldConfig {
@@ -75,5 +75,5 @@ index 647bece31f..08fb0bae3a 100644
}
--
2.24.0
2.26.2

8
patches/server/0078-Option-for-hay-block-fall-damage.patch → patches/server/0079-Option-for-hay-block-fall-damage.patch
View File

@@ -1,4 +1,4 @@
From 23fe49e9e75d1c3ba6d60df0a81f1cc5d363f25e Mon Sep 17 00:00:00 2001
From 56ff33caeb30d23da17cfc109c2aa90e290fe7ca Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 30 Nov 2019 01:31:09 -0600
Subject: [PATCH] Option for hay block fall damage
@@ -9,7 +9,7 @@ Subject: [PATCH] Option for hay block fall damage
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockHay.java b/src/main/java/net/minecraft/server/BlockHay.java
index ca81c49f0a..1f8f60542f 100644
index ca81c49f0..1f8f60542 100644
--- a/src/main/java/net/minecraft/server/BlockHay.java
+++ b/src/main/java/net/minecraft/server/BlockHay.java
@@ -9,6 +9,6 @@ public class BlockHay extends BlockRotatable {
@@ -21,7 +21,7 @@ index ca81c49f0a..1f8f60542f 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 08fb0bae3a..a4a09874fe 100644
index 08fb0bae3..a4a09874f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
@@ -37,5 +37,5 @@ index 08fb0bae3a..a4a09874fe 100644
private void lavaSettings() {
lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite);
--
2.24.0
2.26.2

6
patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch → patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
View File

@@ -1,4 +1,4 @@
From 299391072b30918e1560767e8bbdc5e6746e6b10 Mon Sep 17 00:00:00 2001
From 26ec61f54554a0718d2beda5f5a8d0aee58b724b 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] Add getPlayer to SkeletonHorseTrapEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
index 37626f925f..f8fd2d99cc 100644
index 37626f925..f8fd2d99c 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
@@ -2,7 +2,8 @@ package net.minecraft.server;
@@ -37,5 +37,5 @@ index 37626f925f..f8fd2d99cc 100644
this.a.r(false);
--
2.24.0
2.26.2

8
patches/server/0080-Add-LootableInventoryFirstFillEvent.patch → patches/server/0081-Add-LootableInventoryFirstFillEvent.patch
View File

@@ -1,4 +1,4 @@
From 2430d722450bbd7540f860b986524d670f9b0c49 Mon Sep 17 00:00:00 2001
From 75cfb6ec2610c568bae8a6dda00f45e906ae1612 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 02:43:17 -0500
Subject: [PATCH] Add LootableInventoryFirstFillEvent
@@ -9,7 +9,7 @@ Subject: [PATCH] Add LootableInventoryFirstFillEvent
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
index b5401eaf97..1decf0e895 100644
index b5401eaf9..1decf0e89 100644
--- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
@@ -49,6 +49,10 @@ public class PaperLootableInventoryData {
@@ -24,7 +24,7 @@ index b5401eaf97..1decf0e895 100644
}
diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
index d50410532c..2f24e5a702 100644
index d50410532..2f24e5a70 100644
--- a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java
@@ -57,7 +57,10 @@ public class PaperTileEntityLootableInventory implements PaperLootableBlockInven
@@ -40,5 +40,5 @@ index d50410532c..2f24e5a702 100644
@Override
--
2.24.0
2.26.2

12
patches/server/0081-Villagers-follow-emerald-blocks.patch → patches/server/0082-Villagers-follow-emerald-blocks.patch
View File

@@ -1,4 +1,4 @@
From a25b27dda3e668cb6ff10b7c2e50040951413170 Mon Sep 17 00:00:00 2001
From 19e6faba58e550dc1e079ec3ee6e18d3a22ea2db 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Villagers follow emerald blocks
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 843f22260b..a30ac7cc0b 100644
index 843f22260..a30ac7cc0 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -89,6 +89,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -23,7 +23,7 @@ index 843f22260b..a30ac7cc0b 100644
// Purpur end
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index 5fbd13512f..13063f0068 100644
index 5fbd13512..13063f006 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -13,7 +13,7 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;
@@ -36,7 +36,7 @@ index 5fbd13512f..13063f0068 100644
private CraftMerchant craftMerchant;
diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
index 4e9c5e84a9..14ca5fc367 100644
index 4e9c5e84a..14ca5fc36 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -57,6 +57,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -48,7 +48,7 @@ index 4e9c5e84a9..14ca5fc367 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 a4a09874fe..7d2c51a2fa 100644
index a4a09874f..7d2c51a2f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -775,21 +775,25 @@ public class PurpurWorldConfig {
@@ -78,5 +78,5 @@ index a4a09874fe..7d2c51a2fa 100644
public boolean vindicatorRidable = false;
--
2.24.0
2.26.2

8
patches/server/0082-Add-player-death-exp-control-options.patch → patches/server/0083-Add-player-death-exp-control-options.patch
View File

@@ -1,4 +1,4 @@
From 3cf910339695f40b5ed42563f9c8686edbe777f3 Mon Sep 17 00:00:00 2001
From 92ca7e1fa2b6587b860228b834de3e7afbf8c119 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 22e17e3de3..14b57d678e 100644
index 22e17e3de..14b57d678 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1862,9 +1862,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -35,7 +35,7 @@ index 22e17e3de3..14b57d678e 100644
return 0;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7d2c51a2fa..caf7f0e84f 100644
index 7d2c51a2f..caf7f0e84 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -155,6 +155,8 @@ public class PurpurWorldConfig {
@@ -57,5 +57,5 @@ index 7d2c51a2fa..caf7f0e84f 100644
playerSleepCondition = getString("gameplay-mechanics.player.sleep.condition", playerSleepCondition);
useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
--
2.24.0
2.26.2

4
patches/server/0083-Add-permission-for-F3-N-debug.patch → patches/server/0084-Add-permission-for-F3-N-debug.patch
View File

@@ -1,4 +1,4 @@
From aa5c11cb61cbc8abd619e4c328ebc1c3aba5562e Mon Sep 17 00:00:00 2001
From d0cec740c83328fb65a0ca8c25763f31c4f16d8b 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add permission for F3+N debug
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 54f6dfcaa7..29150bd7d7 100644
index 54f6dfcaa..29150bd7d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -979,6 +979,7 @@ public abstract class PlayerList {

12
patches/server/0084-Allow-leashing-villagers.patch → patches/server/0085-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From db97b9b5b03450f6ab223ddd1db35fc85bdcf914 Mon Sep 17 00:00:00 2001
From 79dd41722e6a0fd20c5c84f6ed83b6eb25a56a40 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Allow leashing villagers
4 files changed, 19 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index bf9d044b0b..3adc3434e1 100644
index bf9d044b0..3adc3434e 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -23,7 +23,7 @@ index bf9d044b0b..3adc3434e1 100644
if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index a30ac7cc0b..e3322fedd7 100644
index a30ac7cc0..e3322fedd 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -1031,4 +1031,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,7 +39,7 @@ index a30ac7cc0b..e3322fedd7 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
index 14ca5fc367..427c589075 100644
index 14ca5fc36..427c58907 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -283,4 +283,11 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -55,7 +55,7 @@ index 14ca5fc367..427c589075 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index caf7f0e84f..284054db42 100644
index caf7f0e84..284054db4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -780,6 +780,7 @@ public class PurpurWorldConfig {
@@ -88,5 +88,5 @@ index caf7f0e84f..284054db42 100644
public boolean vindicatorRidable = false;
--
2.24.0
2.26.2

8
patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch → patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -1,4 +1,4 @@
From 0ed0c2c3d8c57f8dbba946096e73323155c4292e Mon Sep 17 00:00:00 2001
From 2956498159128f608aa1b247a50bb542a496b507 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
2 files changed, 5 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index e3322fedd7..2153b36a3c 100644
index e3322fedd..2153b36a3 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -918,6 +918,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -22,7 +22,7 @@ index e3322fedd7..2153b36a3c 100644
int i = 0;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 284054db42..f60c4b6291 100644
index 284054db4..f60c4b629 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -781,6 +781,8 @@ public class PurpurWorldConfig {
@@ -44,5 +44,5 @@ index 284054db42..f60c4b6291 100644
public boolean villagerTraderRidable = false;
--
2.24.0
2.26.2

10
patches/server/0086-Make-lava-flow-speed-configurable.patch → patches/server/0087-Make-lava-flow-speed-configurable.patch
View File

@@ -1,4 +1,4 @@
From cd754245bf6eccc824291a97f9db8386851c3541 Mon Sep 17 00:00:00 2001
From 2ad07e4e8cf50edf8c2c9a8558941a2cecbdbc57 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Make lava flow speed configurable
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
index 09f82c2d92..470e9bfd01 100644
index 09f82c2d9..470e9bfd0 100644
--- a/src/main/java/net/minecraft/server/FluidTypeLava.java
+++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
@@ -129,7 +129,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
@@ -23,7 +23,7 @@ index 09f82c2d92..470e9bfd01 100644
@Override
diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
index 39252e6873..75f8441ab6 100644
index 39252e687..75f8441ab 100644
--- a/src/main/java/net/minecraft/server/WorldProvider.java
+++ b/src/main/java/net/minecraft/server/WorldProvider.java
@@ -42,6 +42,7 @@ public abstract class WorldProvider {
@@ -35,7 +35,7 @@ index 39252e6873..75f8441ab6 100644
return this.d;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f60c4b6291..c238607acb 100644
index f60c4b629..c238607ac 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -133,8 +133,12 @@ public class PurpurWorldConfig {
@@ -52,5 +52,5 @@ index f60c4b6291..c238607acb 100644
public boolean signAllowColors = false;
--
2.24.0
2.26.2

8
patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch → patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch
View File

@@ -1,4 +1,4 @@
From 687abc1b1ff8e4e40a4e2c3fed099e302b081e4f Mon Sep 17 00:00:00 2001
From c9273015b40bdffe3e7cb4fdc7736de1e6f5aa0b 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add wither skeleton takes wither damage option
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntitySkeletonWither.java b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
index 8aa0a6699f..0fd740e717 100644
index 8aa0a6699..0fd740e71 100644
--- a/src/main/java/net/minecraft/server/EntitySkeletonWither.java
+++ b/src/main/java/net/minecraft/server/EntitySkeletonWither.java
@@ -108,6 +108,6 @@ public class EntitySkeletonWither extends EntitySkeletonAbstract {
@@ -21,7 +21,7 @@ index 8aa0a6699f..0fd740e717 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index c238607acb..d4b4dfdd3b 100644
index c238607ac..d4b4dfdd3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -844,10 +844,12 @@ public class PurpurWorldConfig {
@@ -38,5 +38,5 @@ index c238607acb..d4b4dfdd3b 100644
public boolean wolfRidable = false;
--
2.24.0
2.26.2

20
patches/server/0088-UPnP-Port-Forwarding-Service.patch → patches/server/0089-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From dce1cff61c4daa9eaffa8510209cd74a5256f378 Mon Sep 17 00:00:00 2001
From 57fa86c225f61c3853117c13638b425715d53c50 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,10 +14,10 @@ Subject: [PATCH] UPnP Port Forwarding Service
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
diff --git a/pom.xml b/pom.xml
index d5709e670b..43d6bed366 100644
index 097c736bc..adf7f78da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,12 @@
@@ -55,6 +55,12 @@
<version>1.7.7.1</version>
<scope>compile</scope>
</dependency>
@@ -30,7 +30,7 @@ index d5709e670b..43d6bed366 100644
<!-- Purpur end -->
<dependency>
<groupId>net.minecrell</groupId>
@@ -167,6 +173,10 @@
@@ -166,6 +172,10 @@
<id>spigotmc-public</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
</repository>
@@ -42,10 +42,10 @@ index d5709e670b..43d6bed366 100644
<pluginRepositories>
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index b29f5dc8c2..63b5bbc0e8 100644
index 7f2db5f0b..5cfb6fd3d 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -241,6 +241,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -242,6 +242,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
@@ -78,7 +78,7 @@ index b29f5dc8c2..63b5bbc0e8 100644
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
server.loadPlugins();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 81422ab15a..a888465187 100644
index f23fdd5f2..d9e5eda9b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -106,7 +106,7 @@ index 81422ab15a..a888465187 100644
if (this.server != null) {
this.server.disablePlugins();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c3ecd6fc70..fe38b3ce90 100644
index c3ecd6fc7..fe38b3ce9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -150,6 +150,11 @@ public class PurpurConfig {
@@ -122,7 +122,7 @@ index c3ecd6fc70..fe38b3ce90 100644
private static void dontSendUselessEntityPackets() {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
diff --git a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
index c4903c7db6..ee4f022fc5 100644
index c4903c7db..ee4f022fc 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/JInfoPanel.java
@@ -19,13 +19,16 @@ public class JInfoPanel extends JPanel {
@@ -144,7 +144,7 @@ index c4903c7db6..ee4f022fc5 100644
}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
new file mode 100644
index 0000000000..b0465d3608
index 000000000..b0465d360
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
@@ -0,0 +1,47 @@

6
patches/server/0089-Implement-EntityMoveEvent.patch → patches/server/0090-Implement-EntityMoveEvent.patch
View File

@@ -1,4 +1,4 @@
From c19f79eec707f8dbbb3676acf82506efceba0b9d Mon Sep 17 00:00:00 2001
From c6367af96cad3abb8f53f1f67dc7ed78f2ead29f 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] Implement EntityMoveEvent
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement EntityMoveEvent
1 file changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index d6751e3cce..08ae190b07 100644
index 28e555d6e..387f74fe1 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -17,6 +17,7 @@ import java.util.Random;
@@ -41,5 +41,5 @@ index d6751e3cce..08ae190b07 100644
private void n() {
--
2.24.0
2.26.2

24
patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch → patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
View File

@@ -1,4 +1,4 @@
From 028b721bbfb72653155b305072cc5a9a08c77d67 Mon Sep 17 00:00:00 2001
From d15dafad3161b283965161bcd83c0e2f608fb010 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
@@ -15,10 +15,10 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
8 files changed, 58 insertions(+)
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 1685237dfd..a8c0f9216a 100644
index 20b6b58bd..6278b8d45 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -468,6 +468,7 @@ public class ChunkRegionLoader {
@@ -476,6 +476,7 @@ public class ChunkRegionLoader {
while (iterator1.hasNext()) {
Entity entity = (Entity) iterator1.next();
@@ -27,10 +27,10 @@ index 1685237dfd..a8c0f9216a 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 ce0821a656..b92e956e6c 100644
index 92b77ce34..4fb6a3fd7 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1590,6 +1590,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1775,6 +1775,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
@@ -44,7 +44,7 @@ index ce0821a656..b92e956e6c 100644
String s = this.getSaveID();
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 9c97edf9c9..48da1e662a 100644
index e66f6b300..ae44f878f 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -68,6 +68,13 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -62,7 +62,7 @@ index 9c97edf9c9..48da1e662a 100644
this.av = soundeffect;
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
index 7ebd7da1c5..74f8257ecd 100644
index 7ebd7da1c..74f8257ec 100644
--- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
@@ -19,6 +19,13 @@ public class EntityEnderSignal extends Entity {
@@ -80,7 +80,7 @@ index 7ebd7da1c5..74f8257ecd 100644
if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) {
this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Purpur - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
index 5c3731f68a..ce3168e5de 100644
index 5c3731f68..ce3168e5d 100644
--- a/src/main/java/net/minecraft/server/EntityFireworks.java
+++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -21,6 +21,13 @@ public class EntityFireworks extends Entity implements IProjectile {
@@ -98,7 +98,7 @@ index 5c3731f68a..ce3168e5de 100644
@Override
public void inactiveTick() {
diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
index b7a92e1002..b95ee50a4e 100644
index b7a92e100..b95ee50a4 100644
--- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java
+++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
@@ -19,6 +19,13 @@ public class EntityLlamaSpit extends Entity implements IProjectile {
@@ -116,7 +116,7 @@ index b7a92e1002..b95ee50a4e 100644
public void tick() {
super.tick();
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
index f5c8074dcf..674f2ccc7f 100644
index f5c8074dc..674f2ccc7 100644
--- a/src/main/java/net/minecraft/server/EntityProjectile.java
+++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -35,6 +35,13 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -134,7 +134,7 @@ index f5c8074dcf..674f2ccc7f 100644
float f5 = -MathHelper.sin(f1 * 0.017453292F) * MathHelper.cos(f * 0.017453292F);
float f6 = -MathHelper.sin((f + f2) * 0.017453292F);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index d4b4dfdd3b..51585a7d80 100644
index d4b4dfdd3..51585a7d8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -164,6 +164,7 @@ public class PurpurWorldConfig {
@@ -168,5 +168,5 @@ index d4b4dfdd3b..51585a7d80 100644
public int elytraDamagePerSecond = 1;
--
2.24.0
2.26.2

8
patches/server/0091-Implement-bed-explosion-options.patch → patches/server/0092-Implement-bed-explosion-options.patch
View File

@@ -1,4 +1,4 @@
From 58554dd11fd8b7913babb85ce4e63118433b7d9a Mon Sep 17 00:00:00 2001
From b014b34988129b072bdc1e2636521406e98102a7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Feb 2020 15:04:29 -0600
Subject: [PATCH] Implement bed explosion options
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement bed explosion options
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java
index e0bc6080ef..61a5e06a25 100644
index e0bc6080e..61a5e06a2 100644
--- a/src/main/java/net/minecraft/server/BlockBed.java
+++ b/src/main/java/net/minecraft/server/BlockBed.java
@@ -84,7 +84,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity {
@@ -22,7 +22,7 @@ index e0bc6080ef..61a5e06a25 100644
// CraftBukkit end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 51585a7d80..0e34414a7e 100644
index 51585a7d8..0e34414a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -3,6 +3,7 @@ package net.pl3x.purpur;
@@ -65,5 +65,5 @@ index 51585a7d80..0e34414a7e 100644
public int campfireRegenDuration = 80;
public int campfireRegenRange = 5;
--
2.24.0
2.26.2

12
patches/server/0092-Add-item-entity-options.patch → patches/server/0093-Add-item-entity-options.patch
View File

@@ -1,4 +1,4 @@
From 89ea4e8b3b6cb824adb6f23057e9177d3b66e006 Mon Sep 17 00:00:00 2001
From 04319c50a3ac3023adf72f4209ec5b57464a636f 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, 28 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b92e956e6c..69983550bb 100644
index 4fb6a3fd7..5a8005291 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1321,6 +1321,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1506,6 +1506,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
@@ -22,7 +22,7 @@ index b92e956e6c..69983550bb 100644
return this.a(tag, false);
}
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index bbb9ca1efc..262a7935e7 100644
index bbb9ca1ef..262a7935e 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -71,7 +71,7 @@ public class EntityItem extends Entity {
@@ -56,7 +56,7 @@ index bbb9ca1efc..262a7935e7 100644
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0e34414a7e..4cb856ebbb 100644
index 0e34414a7..4cb856ebb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -5,6 +5,8 @@ import net.minecraft.server.Block;
@@ -100,5 +100,5 @@ index 0e34414a7e..4cb856ebbb 100644
playerDeathExpDropEquation = getString("gameplay-mechanics.player.exp-dropped-on-death.equation", playerDeathExpDropEquation);
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
--
2.24.0
2.26.2

162
patches/server/0093-Make-natural-spawns-per-biome-configurable.patch → patches/server/0094-Make-natural-spawns-per-biome-configurable.patch
View File

@@ -1,4 +1,4 @@
From 0feb6fdfb92a6949ab0224cc4d0d4f05a4fe5278 Mon Sep 17 00:00:00 2001
From 99a4a1ff5afd0d395ef5fab555743441f60e616e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 27 Feb 2020 13:39:06 -0600
Subject: [PATCH] Make natural spawns per biome configurable
@@ -86,7 +86,7 @@ Subject: [PATCH] Make natural spawns per biome configurable
create mode 100644 src/main/resources/biomes.yml
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungle.java b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
index 9c38f8907a..3980504d9c 100644
index 9c38f8907..3980504d9 100644
--- a/src/main/java/net/minecraft/server/BiomeBambooJungle.java
+++ b/src/main/java/net/minecraft/server/BiomeBambooJungle.java
@@ -22,22 +22,6 @@ public class BiomeBambooJungle extends BiomeBase {
@@ -114,7 +114,7 @@ index 9c38f8907a..3980504d9c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
index 2a6dafccdd..501314da9a 100644
index 2a6dafccd..501314da9 100644
--- a/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBambooJungleHills.java
@@ -22,22 +22,6 @@ public final class BiomeBambooJungleHills extends BiomeBase {
@@ -142,7 +142,7 @@ index 2a6dafccdd..501314da9a 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
index 0102a170dc..6e0627fdca 100644
index ef6c85557..51bc8643f 100644
--- a/src/main/java/net/minecraft/server/BiomeBase.java
+++ b/src/main/java/net/minecraft/server/BiomeBase.java
@@ -17,8 +17,25 @@ import org.apache.logging.log4j.Logger;
@@ -181,7 +181,7 @@ index 0102a170dc..6e0627fdca 100644
private final ThreadLocal<Long2FloatLinkedOpenHashMap> w = ThreadLocal.withInitial(() -> {
return (Long2FloatLinkedOpenHashMap) SystemUtils.a(() -> {
Long2FloatLinkedOpenHashMap long2floatlinkedopenhashmap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
@@ -112,6 +129,16 @@ public abstract class BiomeBase {
@@ -124,6 +141,16 @@ public abstract class BiomeBase {
return MathHelper.f(0.62222224F - f * 0.05F, 0.5F + f * 0.1F, 1.0F);
}
@@ -199,7 +199,7 @@ index 0102a170dc..6e0627fdca 100644
((List) this.v.get(enumcreaturetype)).add(biomebase_biomemeta);
}
diff --git a/src/main/java/net/minecraft/server/BiomeBeach.java b/src/main/java/net/minecraft/server/BiomeBeach.java
index f4e9345aeb..d8ff2c9a21 100644
index f4e9345ae..d8ff2c9a2 100644
--- a/src/main/java/net/minecraft/server/BiomeBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeBeach.java
@@ -20,15 +20,6 @@ public final class BiomeBeach extends BiomeBase {
@@ -220,7 +220,7 @@ index f4e9345aeb..d8ff2c9a21 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBigHills.java b/src/main/java/net/minecraft/server/BiomeBigHills.java
index 58c30f6523..7107267421 100644
index 58c30f652..710726742 100644
--- a/src/main/java/net/minecraft/server/BiomeBigHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBigHills.java
@@ -22,19 +22,6 @@ public final class BiomeBigHills extends BiomeBase {
@@ -245,7 +245,7 @@ index 58c30f6523..7107267421 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForest.java b/src/main/java/net/minecraft/server/BiomeBirchForest.java
index 9437438c82..1749c258b9 100644
index 9437438c8..1749c258b 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForest.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForest.java
@@ -21,18 +21,6 @@ public final class BiomeBirchForest extends BiomeBase {
@@ -269,7 +269,7 @@ index 9437438c82..1749c258b9 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
index 3e5c23d31e..5d262c9712 100644
index 3e5c23d31..5d262c971 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestHills.java
@@ -21,18 +21,6 @@ public final class BiomeBirchForestHills extends BiomeBase {
@@ -293,7 +293,7 @@ index 3e5c23d31e..5d262c9712 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
index d5eb5c91c4..de048fb480 100644
index d5eb5c91c..de048fb48 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestHillsMutated.java
@@ -21,18 +21,6 @@ public final class BiomeBirchForestHillsMutated extends BiomeBase {
@@ -317,7 +317,7 @@ index d5eb5c91c4..de048fb480 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
index e805f9568e..2115b05caa 100644
index e805f9568..2115b05ca 100644
--- a/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeBirchForestMutated.java
@@ -21,18 +21,6 @@ public final class BiomeBirchForestMutated extends BiomeBase {
@@ -341,7 +341,7 @@ index e805f9568e..2115b05caa 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeColdBeach.java b/src/main/java/net/minecraft/server/BiomeColdBeach.java
index 1b92f4567d..210226e19f 100644
index 1b92f4567..210226e19 100644
--- a/src/main/java/net/minecraft/server/BiomeColdBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeColdBeach.java
@@ -20,14 +20,6 @@ public final class BiomeColdBeach extends BiomeBase {
@@ -361,7 +361,7 @@ index 1b92f4567d..210226e19f 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
index b9a5cb63a4..3622ef6690 100644
index b9a5cb63a..3622ef669 100644
--- a/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeColdDeepOcean.java
@@ -25,18 +25,6 @@ public class BiomeColdDeepOcean extends BiomeBase {
@@ -385,7 +385,7 @@ index b9a5cb63a4..3622ef6690 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeColdOcean.java b/src/main/java/net/minecraft/server/BiomeColdOcean.java
index 571c3d139d..c640aa9eeb 100644
index 571c3d139..c640aa9ee 100644
--- a/src/main/java/net/minecraft/server/BiomeColdOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeColdOcean.java
@@ -24,18 +24,6 @@ public class BiomeColdOcean extends BiomeBase {
@@ -409,7 +409,7 @@ index 571c3d139d..c640aa9eeb 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaiga.java b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
index 88400e77bf..caaa8ec999 100644
index 88400e77b..caaa8ec99 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaiga.java
@@ -23,21 +23,6 @@ public final class BiomeColdTaiga extends BiomeBase {
@@ -436,7 +436,7 @@ index 88400e77bf..caaa8ec999 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
index 8a8fc7dbd2..323f20452d 100644
index 8a8fc7dbd..323f20452 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaigaHills.java
@@ -22,21 +22,6 @@ public final class BiomeColdTaigaHills extends BiomeBase {
@@ -463,7 +463,7 @@ index 8a8fc7dbd2..323f20452d 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
index 327e6847f0..973eb8eeb6 100644
index 327e6847f..973eb8eeb 100644
--- a/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeColdTaigaMutated.java
@@ -22,21 +22,6 @@ public final class BiomeColdTaigaMutated extends BiomeBase {
@@ -490,7 +490,7 @@ index 327e6847f0..973eb8eeb6 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeDeepOcean.java b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
index 651d44cb37..7088603b15 100644
index 651d44cb3..7088603b1 100644
--- a/src/main/java/net/minecraft/server/BiomeDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeDeepOcean.java
@@ -25,18 +25,6 @@ public final class BiomeDeepOcean extends BiomeBase {
@@ -514,7 +514,7 @@ index 651d44cb37..7088603b15 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeDesert.java b/src/main/java/net/minecraft/server/BiomeDesert.java
index 257732dad7..168614fe59 100644
index 257732dad..168614fe5 100644
--- a/src/main/java/net/minecraft/server/BiomeDesert.java
+++ b/src/main/java/net/minecraft/server/BiomeDesert.java
@@ -24,16 +24,6 @@ public final class BiomeDesert extends BiomeBase {
@@ -536,7 +536,7 @@ index 257732dad7..168614fe59 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeDesertHills.java b/src/main/java/net/minecraft/server/BiomeDesertHills.java
index 3752fc4509..4df4437013 100644
index 3752fc450..4df443701 100644
--- a/src/main/java/net/minecraft/server/BiomeDesertHills.java
+++ b/src/main/java/net/minecraft/server/BiomeDesertHills.java
@@ -22,16 +22,6 @@ public final class BiomeDesertHills extends BiomeBase {
@@ -558,7 +558,7 @@ index 3752fc4509..4df4437013 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeDesertMutated.java b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
index 1a0b569322..ac565c3822 100644
index 1a0b56932..ac565c382 100644
--- a/src/main/java/net/minecraft/server/BiomeDesertMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeDesertMutated.java
@@ -21,16 +21,6 @@ public final class BiomeDesertMutated extends BiomeBase {
@@ -580,7 +580,7 @@ index 1a0b569322..ac565c3822 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
index 8e19e06889..93f9c55bb2 100644
index 8e19e0688..93f9c55bb 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsEdge.java
@@ -22,19 +22,6 @@ public final class BiomeExtremeHillsEdge extends BiomeBase {
@@ -605,7 +605,7 @@ index 8e19e06889..93f9c55bb2 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
index 69d4880c74..5c73ee4fb8 100644
index 69d4880c7..5c73ee4fb 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsMutated.java
@@ -22,19 +22,6 @@ public final class BiomeExtremeHillsMutated extends BiomeBase {
@@ -630,7 +630,7 @@ index 69d4880c74..5c73ee4fb8 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
index 7661d53161..7bc4631db0 100644
index 7661d5316..7bc4631db 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTrees.java
@@ -22,19 +22,6 @@ public final class BiomeExtremeHillsWithTrees extends BiomeBase {
@@ -655,7 +655,7 @@ index 7661d53161..7bc4631db0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
index 05418f8fa1..b618c7e336 100644
index 05418f8fa..b618c7e33 100644
--- a/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeExtremeHillsWithTreesMutated.java
@@ -22,19 +22,6 @@ public final class BiomeExtremeHillsWithTreesMutated extends BiomeBase {
@@ -680,7 +680,7 @@ index 05418f8fa1..b618c7e336 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeFlowerForest.java b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
index 1d3f624323..1d0809c2cc 100644
index 1d3f62432..1d0809c2c 100644
--- a/src/main/java/net/minecraft/server/BiomeFlowerForest.java
+++ b/src/main/java/net/minecraft/server/BiomeFlowerForest.java
@@ -23,19 +23,6 @@ public final class BiomeFlowerForest extends BiomeBase {
@@ -705,7 +705,7 @@ index 1d3f624323..1d0809c2cc 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
index e849b411c6..2b69a128a6 100644
index e849b411c..2b69a128a 100644
--- a/src/main/java/net/minecraft/server/BiomeForest.java
+++ b/src/main/java/net/minecraft/server/BiomeForest.java
@@ -22,19 +22,6 @@ public final class BiomeForest extends BiomeBase {
@@ -730,7 +730,7 @@ index e849b411c6..2b69a128a6 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeForestHills.java b/src/main/java/net/minecraft/server/BiomeForestHills.java
index f7dea38eb3..57c7091816 100644
index f7dea38eb..57c709181 100644
--- a/src/main/java/net/minecraft/server/BiomeForestHills.java
+++ b/src/main/java/net/minecraft/server/BiomeForestHills.java
@@ -22,19 +22,6 @@ public final class BiomeForestHills extends BiomeBase {
@@ -755,7 +755,7 @@ index f7dea38eb3..57c7091816 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
index 67d120bef2..f1ab35f2fa 100644
index 67d120bef..f1ab35f2f 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenDeepOcean.java
@@ -26,19 +26,7 @@ public class BiomeFrozenDeepOcean extends BiomeBase {
@@ -780,7 +780,7 @@ index 67d120bef2..f1ab35f2fa 100644
@Override
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
index 2772bc6dac..3941438d92 100644
index 2772bc6da..3941438d9 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenOcean.java
@@ -25,19 +25,7 @@ public final class BiomeFrozenOcean extends BiomeBase {
@@ -805,7 +805,7 @@ index 2772bc6dac..3941438d92 100644
@Override
diff --git a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
index 4be53fc0f6..f5d98bcac9 100644
index 4be53fc0f..f5d98bcac 100644
--- a/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
+++ b/src/main/java/net/minecraft/server/BiomeFrozenRiver.java
@@ -19,17 +19,6 @@ public final class BiomeFrozenRiver extends BiomeBase {
@@ -828,7 +828,7 @@ index 4be53fc0f6..f5d98bcac9 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeHell.java b/src/main/java/net/minecraft/server/BiomeHell.java
index 888dfcd8d4..dd3375ef84 100644
index 888dfcd8d..dd3375ef8 100644
--- a/src/main/java/net/minecraft/server/BiomeHell.java
+++ b/src/main/java/net/minecraft/server/BiomeHell.java
@@ -18,9 +18,6 @@ public final class BiomeHell extends BiomeBase {
@@ -843,7 +843,7 @@ index 888dfcd8d4..dd3375ef84 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeIceMountains.java b/src/main/java/net/minecraft/server/BiomeIceMountains.java
index ad9b4efe09..0e98efb9e9 100644
index ad9b4efe0..0e98efb9e 100644
--- a/src/main/java/net/minecraft/server/BiomeIceMountains.java
+++ b/src/main/java/net/minecraft/server/BiomeIceMountains.java
@@ -20,18 +20,7 @@ public final class BiomeIceMountains extends BiomeBase {
@@ -867,7 +867,7 @@ index ad9b4efe09..0e98efb9e9 100644
@Override
diff --git a/src/main/java/net/minecraft/server/BiomeIcePlains.java b/src/main/java/net/minecraft/server/BiomeIcePlains.java
index 71606b0a71..ba0a16faa6 100644
index 71606b0a7..ba0a16faa 100644
--- a/src/main/java/net/minecraft/server/BiomeIcePlains.java
+++ b/src/main/java/net/minecraft/server/BiomeIcePlains.java
@@ -23,18 +23,7 @@ public final class BiomeIcePlains extends BiomeBase {
@@ -891,7 +891,7 @@ index 71606b0a71..ba0a16faa6 100644
@Override
diff --git a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
index 984f94bb59..375ccf9c45 100644
index 984f94bb5..375ccf9c4 100644
--- a/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
+++ b/src/main/java/net/minecraft/server/BiomeIcePlainsSpikes.java
@@ -22,18 +22,7 @@ public final class BiomeIcePlainsSpikes extends BiomeBase {
@@ -915,7 +915,7 @@ index 984f94bb59..375ccf9c45 100644
@Override
diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
index 95e5019968..2b154a2761 100644
index 95e501996..2b154a276 100644
--- a/src/main/java/net/minecraft/server/BiomeJungle.java
+++ b/src/main/java/net/minecraft/server/BiomeJungle.java
@@ -23,22 +23,6 @@ public final class BiomeJungle extends BiomeBase {
@@ -943,7 +943,7 @@ index 95e5019968..2b154a2761 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdge.java b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
index e624f9764f..e6cf5d8539 100644
index e624f9764..e6cf5d853 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleEdge.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleEdge.java
@@ -21,19 +21,6 @@ public final class BiomeJungleEdge extends BiomeBase {
@@ -968,7 +968,7 @@ index e624f9764f..e6cf5d8539 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
index 1fe9c840a7..d4c9907b28 100644
index 1fe9c840a..d4c9907b2 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleEdgeMutated.java
@@ -21,19 +21,6 @@ public final class BiomeJungleEdgeMutated extends BiomeBase {
@@ -993,7 +993,7 @@ index 1fe9c840a7..d4c9907b28 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeJungleHills.java b/src/main/java/net/minecraft/server/BiomeJungleHills.java
index e2970ab00e..9e7b702c8a 100644
index e2970ab00..9e7b702c8 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleHills.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleHills.java
@@ -23,22 +23,6 @@ public final class BiomeJungleHills extends BiomeBase {
@@ -1021,7 +1021,7 @@ index e2970ab00e..9e7b702c8a 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeJungleMutated.java b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
index ffe6b4344e..f308e0dd45 100644
index ffe6b4344..f308e0dd4 100644
--- a/src/main/java/net/minecraft/server/BiomeJungleMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeJungleMutated.java
@@ -21,21 +21,6 @@ public final class BiomeJungleMutated extends BiomeBase {
@@ -1048,7 +1048,7 @@ index ffe6b4344e..f308e0dd45 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
index b23c43305b..092233c50c 100644
index b23c43305..092233c50 100644
--- a/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeLukewarmDeepOcean.java
@@ -25,20 +25,6 @@ public class BiomeLukewarmDeepOcean extends BiomeBase {
@@ -1074,7 +1074,7 @@ index b23c43305b..092233c50c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
index efcb11bbe8..1cebd5ce74 100644
index efcb11bbe..1cebd5ce7 100644
--- a/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeLukewarmOcean.java
@@ -23,20 +23,6 @@ public class BiomeLukewarmOcean extends BiomeBase {
@@ -1100,7 +1100,7 @@ index efcb11bbe8..1cebd5ce74 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
index 328e939a6f..d0fe6c4493 100644
index 328e939a6..d0fe6c449 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaSpruceTaiga.java
@@ -23,21 +23,6 @@ public final class BiomeMegaSpruceTaiga extends BiomeBase {
@@ -1127,7 +1127,7 @@ index 328e939a6f..d0fe6c4493 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
index 36bea710a0..e3aad431e2 100644
index 36bea710a..e3aad431e 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaTaiga.java
@@ -23,21 +23,6 @@ public final class BiomeMegaTaiga extends BiomeBase {
@@ -1154,7 +1154,7 @@ index 36bea710a0..e3aad431e2 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
index 22474d682a..2ef445ce64 100644
index 22474d682..2ef445ce6 100644
--- a/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeMegaTaigaHills.java
@@ -23,21 +23,6 @@ public final class BiomeMegaTaigaHills extends BiomeBase {
@@ -1181,7 +1181,7 @@ index 22474d682a..2ef445ce64 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
index 65d606d51c..8906115d47 100644
index 65d606d51..8906115d4 100644
--- a/src/main/java/net/minecraft/server/BiomeMesa.java
+++ b/src/main/java/net/minecraft/server/BiomeMesa.java
@@ -19,14 +19,6 @@ public final class BiomeMesa extends BiomeBase {
@@ -1201,7 +1201,7 @@ index 65d606d51c..8906115d47 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMesaBryce.java b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
index 5ecec62f18..401fbd2d16 100644
index 5ecec62f1..401fbd2d1 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaBryce.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaBryce.java
@@ -19,14 +19,6 @@ public final class BiomeMesaBryce extends BiomeBase {
@@ -1221,7 +1221,7 @@ index 5ecec62f18..401fbd2d16 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
index 14d4bd312e..77a5828f07 100644
index 14d4bd312..77a5828f0 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeu.java
@@ -20,14 +20,6 @@ public final class BiomeMesaPlataeu extends BiomeBase {
@@ -1241,7 +1241,7 @@ index 14d4bd312e..77a5828f07 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
index b5dab9d2aa..a888312556 100644
index b5dab9d2a..a88831255 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlataeuClear.java
@@ -19,14 +19,6 @@ public final class BiomeMesaPlataeuClear extends BiomeBase {
@@ -1261,7 +1261,7 @@ index b5dab9d2aa..a888312556 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
index d05cc38b5e..be07387135 100644
index d05cc38b5..be0738713 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauClearMutated.java
@@ -19,14 +19,6 @@ public final class BiomeMesaPlateauClearMutated extends BiomeBase {
@@ -1281,7 +1281,7 @@ index d05cc38b5e..be07387135 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
index 21a77ee812..2a213025b9 100644
index 21a77ee81..2a213025b 100644
--- a/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeMesaPlateauMutated.java
@@ -20,14 +20,6 @@ public final class BiomeMesaPlateauMutated extends BiomeBase {
@@ -1301,7 +1301,7 @@ index 21a77ee812..2a213025b9 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
index 0302efbdc7..f0be681aaf 100644
index 0302efbdc..f0be681aa 100644
--- a/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
+++ b/src/main/java/net/minecraft/server/BiomeMushroomIslandShore.java
@@ -18,7 +18,6 @@ public final class BiomeMushroomIslandShore extends BiomeBase {
@@ -1314,7 +1314,7 @@ index 0302efbdc7..f0be681aaf 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeMushrooms.java b/src/main/java/net/minecraft/server/BiomeMushrooms.java
index 51f92584b8..0118df023f 100644
index 51f92584b..0118df023 100644
--- a/src/main/java/net/minecraft/server/BiomeMushrooms.java
+++ b/src/main/java/net/minecraft/server/BiomeMushrooms.java
@@ -18,7 +18,6 @@ public final class BiomeMushrooms extends BiomeBase {
@@ -1327,7 +1327,7 @@ index 51f92584b8..0118df023f 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeOcean.java b/src/main/java/net/minecraft/server/BiomeOcean.java
index ad9628b2aa..5f4617c0a6 100644
index ad9628b2a..5f4617c0a 100644
--- a/src/main/java/net/minecraft/server/BiomeOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeOcean.java
@@ -24,18 +24,6 @@ public final class BiomeOcean extends BiomeBase {
@@ -1351,7 +1351,7 @@ index ad9628b2aa..5f4617c0a6 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomePlains.java b/src/main/java/net/minecraft/server/BiomePlains.java
index ff6090e3c1..266f4165a4 100644
index ff6090e3c..266f4165a 100644
--- a/src/main/java/net/minecraft/server/BiomePlains.java
+++ b/src/main/java/net/minecraft/server/BiomePlains.java
@@ -21,20 +21,6 @@ public final class BiomePlains extends BiomeBase {
@@ -1377,7 +1377,7 @@ index ff6090e3c1..266f4165a4 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
index a28222eb1d..f35557dfdf 100644
index a28222eb1..f35557dfd 100644
--- a/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeRedwoodTaigaHillsMutated.java
@@ -23,21 +23,6 @@ public final class BiomeRedwoodTaigaHillsMutated extends BiomeBase {
@@ -1404,7 +1404,7 @@ index a28222eb1d..f35557dfdf 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeRiver.java b/src/main/java/net/minecraft/server/BiomeRiver.java
index b84b868b1a..405cc2bff4 100644
index b84b868b1..405cc2bff 100644
--- a/src/main/java/net/minecraft/server/BiomeRiver.java
+++ b/src/main/java/net/minecraft/server/BiomeRiver.java
@@ -20,17 +20,6 @@ public final class BiomeRiver extends BiomeBase {
@@ -1427,7 +1427,7 @@ index b84b868b1a..405cc2bff4 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForest.java b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
index 16bcf9bff0..f02a8a03c7 100644
index 16bcf9bff..f02a8a03c 100644
--- a/src/main/java/net/minecraft/server/BiomeRoofedForest.java
+++ b/src/main/java/net/minecraft/server/BiomeRoofedForest.java
@@ -24,18 +24,6 @@ public final class BiomeRoofedForest extends BiomeBase {
@@ -1451,7 +1451,7 @@ index 16bcf9bff0..f02a8a03c7 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
index 9fa84c87fa..9ee0fc6a43 100644
index 9fa84c87f..9ee0fc6a4 100644
--- a/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeRoofedForestMutated.java
@@ -24,18 +24,6 @@ public final class BiomeRoofedForestMutated extends BiomeBase {
@@ -1475,7 +1475,7 @@ index 9fa84c87fa..9ee0fc6a43 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSavanna.java b/src/main/java/net/minecraft/server/BiomeSavanna.java
index c12a890165..a539fc362d 100644
index c12a89016..a539fc362 100644
--- a/src/main/java/net/minecraft/server/BiomeSavanna.java
+++ b/src/main/java/net/minecraft/server/BiomeSavanna.java
@@ -23,20 +23,6 @@ public final class BiomeSavanna extends BiomeBase {
@@ -1501,7 +1501,7 @@ index c12a890165..a539fc362d 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
index db8b20a6c7..e041fcd412 100644
index db8b20a6c..e041fcd41 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaMutated.java
@@ -20,20 +20,6 @@ public final class BiomeSavannaMutated extends BiomeBase {
@@ -1527,7 +1527,7 @@ index db8b20a6c7..e041fcd412 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
index 2826c510d8..08407ea3e0 100644
index 2826c510d..08407ea3e 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateau.java
@@ -21,21 +21,6 @@ public final class BiomeSavannaPlateau extends BiomeBase {
@@ -1554,7 +1554,7 @@ index 2826c510d8..08407ea3e0 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
index e544a8f6b9..337310263c 100644
index e544a8f6b..337310263 100644
--- a/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSavannaPlateauMutated.java
@@ -20,20 +20,6 @@ public final class BiomeSavannaPlateauMutated extends BiomeBase {
@@ -1580,7 +1580,7 @@ index e544a8f6b9..337310263c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeStoneBeach.java b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
index 34660f9f84..3a96c2aeba 100644
index 34660f9f8..3a96c2aeb 100644
--- a/src/main/java/net/minecraft/server/BiomeStoneBeach.java
+++ b/src/main/java/net/minecraft/server/BiomeStoneBeach.java
@@ -19,14 +19,6 @@ public final class BiomeStoneBeach extends BiomeBase {
@@ -1600,7 +1600,7 @@ index 34660f9f84..3a96c2aeba 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
index 8815c95900..f971bc4bcb 100644
index 8815c9590..f971bc4bc 100644
--- a/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
+++ b/src/main/java/net/minecraft/server/BiomeSunflowerPlains.java
@@ -21,20 +21,6 @@ public final class BiomeSunflowerPlains extends BiomeBase {
@@ -1626,7 +1626,7 @@ index 8815c95900..f971bc4bcb 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSwamp.java b/src/main/java/net/minecraft/server/BiomeSwamp.java
index 02584897e9..011628fff2 100644
index 02584897e..011628fff 100644
--- a/src/main/java/net/minecraft/server/BiomeSwamp.java
+++ b/src/main/java/net/minecraft/server/BiomeSwamp.java
@@ -20,19 +20,6 @@ public final class BiomeSwamp extends BiomeBase {
@@ -1651,7 +1651,7 @@ index 02584897e9..011628fff2 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
index d85b01b956..10c6b4eb39 100644
index d85b01b95..10c6b4eb3 100644
--- a/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeSwamplandMutated.java
@@ -18,19 +18,6 @@ public final class BiomeSwamplandMutated extends BiomeBase {
@@ -1676,7 +1676,7 @@ index d85b01b956..10c6b4eb39 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java
index ae6e6ca896..456b6b1747 100644
index ae6e6ca89..456b6b174 100644
--- a/src/main/java/net/minecraft/server/BiomeTaiga.java
+++ b/src/main/java/net/minecraft/server/BiomeTaiga.java
@@ -24,21 +24,6 @@ public final class BiomeTaiga extends BiomeBase {
@@ -1703,7 +1703,7 @@ index ae6e6ca896..456b6b1747 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTaigaHills.java b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
index 4e19fe5ae9..cc699e354d 100644
index 4e19fe5ae..cc699e354 100644
--- a/src/main/java/net/minecraft/server/BiomeTaigaHills.java
+++ b/src/main/java/net/minecraft/server/BiomeTaigaHills.java
@@ -22,21 +22,6 @@ public final class BiomeTaigaHills extends BiomeBase {
@@ -1730,7 +1730,7 @@ index 4e19fe5ae9..cc699e354d 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
index 05e833ffed..3c722f50a9 100644
index 05e833ffe..3c722f50a 100644
--- a/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
+++ b/src/main/java/net/minecraft/server/BiomeTaigaMutated.java
@@ -22,21 +22,6 @@ public final class BiomeTaigaMutated extends BiomeBase {
@@ -1757,7 +1757,7 @@ index 05e833ffed..3c722f50a9 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEnd.java b/src/main/java/net/minecraft/server/BiomeTheEnd.java
index 22e9789a36..6a5a8a991a 100644
index 22e9789a3..6a5a8a991 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEnd.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEnd.java
@@ -8,6 +8,6 @@ public final class BiomeTheEnd extends BiomeBase {
@@ -1769,7 +1769,7 @@ index 22e9789a36..6a5a8a991a 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
index 5b068299c8..07d72737b5 100644
index 5b068299c..07d72737b 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndBarrenIsland.java
@@ -5,6 +5,6 @@ public class BiomeTheEndBarrenIsland extends BiomeBase {
@@ -1781,7 +1781,7 @@ index 5b068299c8..07d72737b5 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
index a26d56aa45..839d3e616a 100644
index a26d56aa4..839d3e616 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndFloatingIslands.java
@@ -6,6 +6,6 @@ public class BiomeTheEndFloatingIslands extends BiomeBase {
@@ -1793,7 +1793,7 @@ index a26d56aa45..839d3e616a 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
index e47add3e43..53aa6243de 100644
index e47add3e4..53aa6243d 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
@@ -8,6 +8,6 @@ public class BiomeTheEndHighIsland extends BiomeBase {
@@ -1805,7 +1805,7 @@ index e47add3e43..53aa6243de 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
index ec92a84579..2452f18013 100644
index ec92a8457..2452f1801 100644
--- a/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
+++ b/src/main/java/net/minecraft/server/BiomeTheEndMediumIsland.java
@@ -6,6 +6,6 @@ public class BiomeTheEndMediumIsland extends BiomeBase {
@@ -1817,7 +1817,7 @@ index ec92a84579..2452f18013 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeVoid.java b/src/main/java/net/minecraft/server/BiomeVoid.java
index c9ba334535..5549d61421 100644
index c9ba33453..5549d6142 100644
--- a/src/main/java/net/minecraft/server/BiomeVoid.java
+++ b/src/main/java/net/minecraft/server/BiomeVoid.java
@@ -5,5 +5,6 @@ public final class BiomeVoid extends BiomeBase {
@@ -1828,7 +1828,7 @@ index c9ba334535..5549d61421 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
index 11dc5f6374..c3fc79fb31 100644
index 11dc5f637..c3fc79fb3 100644
--- a/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeWarmDeepOcean.java
@@ -24,18 +24,6 @@ public class BiomeWarmDeepOcean extends BiomeBase {
@@ -1852,7 +1852,7 @@ index 11dc5f6374..c3fc79fb31 100644
}
}
diff --git a/src/main/java/net/minecraft/server/BiomeWarmOcean.java b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
index e4dc7d198c..00f94b906b 100644
index e4dc7d198..00f94b906 100644
--- a/src/main/java/net/minecraft/server/BiomeWarmOcean.java
+++ b/src/main/java/net/minecraft/server/BiomeWarmOcean.java
@@ -26,18 +26,6 @@ public class BiomeWarmOcean extends BiomeBase {
@@ -1876,7 +1876,7 @@ index e4dc7d198c..00f94b906b 100644
}
}
diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java
index 12742870ca..a448c77264 100644
index 12742870c..a448c7726 100644
--- a/src/main/java/net/minecraft/server/Biomes.java
+++ b/src/main/java/net/minecraft/server/Biomes.java
@@ -87,6 +87,34 @@ public abstract class Biomes {
@@ -1916,7 +1916,7 @@ index 12742870ca..a448c77264 100644
diff --git a/src/main/resources/biomes.yml b/src/main/resources/biomes.yml
new file mode 100644
index 0000000000..f0ea65299f
index 000000000..f0ea65299
--- /dev/null
+++ b/src/main/resources/biomes.yml
@@ -0,0 +1,1042 @@
@@ -2963,5 +2963,5 @@ index 0000000000..f0ea65299f
+ panda: 80,1,2
+ bat: 10,8,8
--
2.24.0
2.26.2

10
patches/server/0094-Configurable-void-damage-height.patch → patches/server/0095-Configurable-void-damage-height.patch
View File

@@ -1,4 +1,4 @@
From 952255e563565af1c226c5d886251a2ff1fcc590 Mon Sep 17 00:00:00 2001
From 8ee208d56db71cdc6ebaa58e4ec41a207b817e87 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 69983550bb..86e244e068 100644
index 5a8005291..a20660a9b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -504,7 +504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -512,7 +512,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// Paper start
protected void performVoidDamage() {
@@ -22,7 +22,7 @@ index 69983550bb..86e244e068 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 4cb856ebbb..53c8782b59 100644
index 4cb856ebb..53c8782b5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -189,6 +189,7 @@ public class PurpurWorldConfig {
@@ -42,5 +42,5 @@ index 4cb856ebbb..53c8782b59 100644
public int elytraDamagePerSecond = 1;
--
2.24.0
2.26.2

10
patches/server/0095-Fix-the-dead-lagging-the-server.patch → patches/server/0096-Fix-the-dead-lagging-the-server.patch
View File

@@ -1,4 +1,4 @@
From 2bef94930f06417351be84330589567fa5363bc0 Mon Sep 17 00:00:00 2001
From b6593875f6295967977bb7df7397bbc7de3b900b 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 86e244e068..c72b4fbd0e 100644
index a20660a9b..cb6dec517 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1407,7 +1407,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1592,7 +1592,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 86e244e068..c72b4fbd0e 100644
public void setPositionRotation(BlockPosition blockposition, float f, float f1) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 08ae190b07..e9ef6d00c8 100644
index 387f74fe1..dae35c55e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2398,7 +2398,7 @@ public abstract class EntityLiving extends Entity {
@@ -35,5 +35,5 @@ index 08ae190b07..e9ef6d00c8 100644
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
--
2.24.0
2.26.2

14
patches/server/0096-Add-ping-command.patch → patches/server/0097-Add-ping-command.patch
View File

@@ -1,4 +1,4 @@
From adb43d0023fe0bc1e3fbb46cf03f342b13c8a7b3 Mon Sep 17 00:00:00 2001
From 4eecea21cef90813c2146f04ed615fbcce3104a4 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Add /ping command
create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java
diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
index 39a6a9ac00..5568649b7e 100644
index 39a6a9ac0..5568649b7 100644
--- a/src/main/java/net/minecraft/server/ArgumentEntity.java
+++ b/src/main/java/net/minecraft/server/ArgumentEntity.java
@@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType<EntitySelector> {
@@ -30,7 +30,7 @@ index 39a6a9ac00..5568649b7e 100644
List<EntityPlayer> list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource());
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 2d512aa4f9..5aa10d16bc 100644
index 2d512aa4f..5aa10d16b 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -30,7 +30,7 @@ import org.bukkit.event.server.ServerCommandEvent;
@@ -64,7 +64,7 @@ index 2d512aa4f9..5aa10d16bc 100644
return RequiredArgumentBuilder.argument(s, argumenttype);
}
diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
index c988c929f1..5c980b70cd 100644
index c988c929f..5c980b70c 100644
--- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
+++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
@@ -178,6 +178,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys
@@ -77,7 +77,7 @@ index c988c929f1..5c980b70cd 100644
throw CommandListenerWrapper.a.create();
diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java
new file mode 100644
index 0000000000..dac3083bf0
index 000000000..dac3083bf
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
@@ -0,0 +1,33 @@
@@ -115,7 +115,7 @@ index 0000000000..dac3083bf0
+ }
+}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index e925e1374d..e81beea7fa 100644
index e925e1374..e81beea7f 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1,5 +1,6 @@
@@ -126,5 +126,5 @@ index e925e1374d..e81beea7fa 100644
"idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
}
--
2.24.0
2.26.2

8
patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch → patches/server/0098-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
View File

@@ -1,4 +1,4 @@
From c5f926362fe165454e0b60d2efad7bda9a58b2ec Mon Sep 17 00:00:00 2001
From 61a6efa1c75f844cfe4d8e36970f701ea23cf6f4 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java
index ed8e26aa45..ca6c0ec299 100644
index ed8e26aa4..ca6c0ec29 100644
--- a/src/main/java/net/minecraft/server/EntityThrownTrident.java
+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java
@@ -38,7 +38,7 @@ public class EntityThrownTrident extends EntityArrow {
@@ -22,7 +22,7 @@ index ed8e26aa45..ca6c0ec299 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 53c8782b59..01b8fffe14 100644
index 53c8782b5..01b8fffe1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -189,6 +189,7 @@ public class PurpurWorldConfig {
@@ -42,5 +42,5 @@ index 53c8782b59..01b8fffe14 100644
}
--
2.24.0
2.26.2

12
patches/server/0098-Configurable-server-mod-name.patch → patches/server/0099-Configurable-server-mod-name.patch
View File

@@ -1,4 +1,4 @@
From b873e07765d3a575cc2473859ea76d6d87c0173b Mon Sep 17 00:00:00 2001
From a6328f61740886172bbdb27c1eb88fb4b51d6650 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,20 +9,20 @@ 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 a888465187..9052d4475d 100644
index d9e5eda9b..d91d3a82c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1588,7 +1588,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1648,7 +1648,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {
- return "Purpur"; // Purpur - Purpur > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur
- return "Purpur"; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
+ return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
}
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fe38b3ce90..a729e7d204 100644
index fe38b3ce9..a729e7d20 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -181,6 +181,11 @@ public class PurpurConfig {

6
patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch → patches/server/0100-End-gateway-should-check-if-entity-can-use-portal.patch
View File

@@ -1,4 +1,4 @@
From dda5fc5ad51706c33ad1cc5a98bb2c9012e64aac Mon Sep 17 00:00:00 2001
From 9f22c699aeb8bb9426f86c11f9b5d5b9d2db6de3 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 87aef515c6..55294b5dfa 100644
index 87aef515c..55294b5df 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
@@ -20,5 +20,5 @@ index 87aef515c6..55294b5dfa 100644
if (this.exitPortal == null && this.world.worldProvider instanceof WorldProviderTheEnd) {
this.a((WorldServer) this.world);
--
2.24.0
2.26.2

Some files were not shown because too many files have changed in this diff Show More