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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
3dafa6a0 Updated Upstream (CraftBukkit)
77b05b9c Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-03 04:33:26 -06:00
parent 853bcfb6de
commit 23d7b00d9c
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 55b3a09dde...3dafa6a08a

2
current-paper
View File

@@ -1 +1 @@
1.15.2--332647fe7fd1d921cbadf5e3c0bd2256200ed355
1.15.2--4515cbc7b8fc1c756d08d7344e9ca35283c8b4f1

10
patches/api/0002-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From c7a9cc3cca9498a9d55596b6941f5376f2e2b1bf Mon Sep 17 00:00:00 2001
From e51447a1efd39253f34151d4229b2f68ac2a4328 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
2 files changed, 20 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 388c2bbfa..e4d874557 100644
index 355bd2e22..79560dcca 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1605,6 +1605,17 @@ public final class Bukkit {
@@ -1619,6 +1619,17 @@ public final class Bukkit {
}
// Paper end
@@ -31,10 +31,10 @@ index 388c2bbfa..e4d874557 100644
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a13717306..8179c7e72 100644
index 98e7ba900..863da99d4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1404,4 +1404,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1416,4 +1416,13 @@ public interface Server extends PluginMessageRecipient {
*/
int getCurrentTick();
// Paper end

10
patches/api/0012-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From a16b381d7e18bf1f5bec89265dac170878e706f9 Mon Sep 17 00:00:00 2001
From 41324ce78820672bb1261893cceefd11d6022bd0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index e4d874557..c45a1161f 100644
index 79560dcca..5c39d73f2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1614,6 +1614,15 @@ public final class Bukkit {
@@ -1628,6 +1628,15 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index e4d874557..c45a1161f 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8179c7e72..ec702f290 100644
index 863da99d4..88b7d606c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1412,5 +1412,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1424,5 +1424,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();

12
patches/api/0027-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From f9315e180c14b58252a214df391a8aebe9e7d13e Mon Sep 17 00:00:00 2001
From c1200033ce45f4a05561b8f86f3a354014471567 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 31 Dec 2019 23:00:07 -0600
Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,10 +14,10 @@ Subject: [PATCH] Remove pointless annotations and deprecations
7 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b6f8942c0..ebb4ff682 100644
index 5c39d73f2..10d0537d0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -793,13 +793,10 @@ public final class Bukkit {
@@ -807,13 +807,10 @@ public final class Bukkit {
* This will return an object even if the player does not exist. To this
* method, all players will exist.
*
@@ -32,10 +32,10 @@ index b6f8942c0..ebb4ff682 100644
public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
return server.getOfflinePlayer(name);
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ee768158b..fb85ad18a 100644
index 88b7d606c..97a981923 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -660,13 +660,10 @@ public interface Server extends PluginMessageRecipient {
@@ -672,13 +672,10 @@ public interface Server extends PluginMessageRecipient {
* This will return an object even if the player does not exist. To this
* method, all players will exist.
*
@@ -72,7 +72,7 @@ index e9cf71f5c..34d3462c7 100644
+ public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 5426e7c2f..cc324fe23 100644
index d7d6a3e83..cf8d77491 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

10
patches/api/0029-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From e9c512e9e808d037a5d27906f2ed26439878b8e6 Mon Sep 17 00:00:00 2001
From ba6cb31517bc0cdeb1fb90caf3eb3bbc8d58c617 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
2 files changed, 34 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f6076e94a..739934632 100644
index 10d0537d0..d49cf61b4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1620,6 +1620,25 @@ public final class Bukkit {
@@ -1634,6 +1634,25 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -39,10 +39,10 @@ index f6076e94a..739934632 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 22f6ac18a..efd7c87f1 100644
index 97a981923..f98c6a046 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1416,5 +1416,20 @@ public interface Server extends PluginMessageRecipient {
@@ -1428,5 +1428,20 @@ public interface Server extends PluginMessageRecipient {
* @return True if lagging
*/
boolean isLagging();

18
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From 894c5cefe22f6c83571efd72a619ea94ff05fd9b Mon Sep 17 00:00:00 2001
From 38ec69b8af0c07ed01d1cf85a8580f4677be88d8 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
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index 55679af926..e6fc4d014e 100644
index 55679af92..e6fc4d014 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -73,7 +73,7 @@ index 55679af926..e6fc4d014e 100644
</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 cd6e25923..bb227bc0f 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 {
@@ -86,7 +86,7 @@ index cd6e259239..bb227bc0fb 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 346664cee0..ac45dbf59b 100644
index 346664cee..ac45dbf59 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1484,7 +1484,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -100,7 +100,7 @@ index 346664cee0..ac45dbf59b 100644
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 @@
@@ -220,10 +220,10 @@ index 0000000000..d8b408f061
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ee5c57ca24..55b8492373 100644
index b7dfda265..fc074a66c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -201,7 +201,7 @@ import javax.annotation.Nullable; // Paper
@@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -233,7 +233,7 @@ index ee5c57ca24..55b8492373 100644
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 770375ed42..0e5da2a30d 100644
index 770375ed4..0e5da2a30 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -246,7 +246,7 @@ index 770375ed42..0e5da2a30d 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 674096cab..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 {

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

@@ -1,4 +1,4 @@
From 8377227e21f726b0fbdd19d13fd35540bac7af07 Mon Sep 17 00:00:00 2001
From dfc3aa2e6ea6503caca1d62421854293475ee6f4 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
@@ -20,7 +20,7 @@ Subject: [PATCH] Purpur config files
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 1d7d1ffbf7..d886f1d145 100644
index 1d7d1ffbf..d886f1d14 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -96,10 +96,12 @@ public class PaperConfig {
@@ -37,7 +37,7 @@ index 1d7d1ffbf7..d886f1d145 100644
static void readConfig(Class<?> clazz, Object instance) {
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 349a0ea213..d70c8cab2b 100644
index 349a0ea21..d70c8cab2 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
@@ -57,7 +57,7 @@ index 349a0ea213..d70c8cab2b 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9135113884..b737a0f0ca 100644
index 913511388..b737a0f0c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -80,6 +80,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -79,7 +79,7 @@ index 9135113884..b737a0f0ca 100644
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/Metrics.java b/src/main/java/net/pl3x/purpur/Metrics.java
new file mode 100644
index 0000000000..246eb8140f
index 000000000..246eb8140
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/Metrics.java
@@ -0,0 +1,598 @@
@@ -683,7 +683,7 @@ index 0000000000..246eb8140f
+}
diff --git a/src/main/java/net/pl3x/purpur/PurpurCommand.java b/src/main/java/net/pl3x/purpur/PurpurCommand.java
new file mode 100644
index 0000000000..f8cf4ad234
index 000000000..f8cf4ad23
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurCommand.java
@@ -0,0 +1,66 @@
@@ -755,7 +755,7 @@ index 0000000000..f8cf4ad234
+}
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..6f378b5f69
index 000000000..6f378b5f6
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,133 @@
@@ -894,7 +894,7 @@ index 0000000000..6f378b5f69
+}
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..4985f21733
index 000000000..4985f2173
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,60 @@
@@ -959,10 +959,10 @@ index 0000000000..4985f21733
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 55b8492373..4c15bd403d 100644
index fc074a66c..daa94187f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -794,6 +794,7 @@ public final class CraftServer implements Server {
@@ -796,6 +796,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
@@ -970,7 +970,7 @@ index 55b8492373..4c15bd403d 100644
for (WorldServer world : console.getWorlds()) {
world.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -810,6 +811,7 @@ public final class CraftServer implements Server {
@@ -812,6 +813,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -978,7 +978,7 @@ index 55b8492373..4c15bd403d 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -828,6 +830,7 @@ public final class CraftServer implements Server {
@@ -830,6 +832,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -987,7 +987,7 @@ index 55b8492373..4c15bd403d 100644
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index eb5f44e300..7e8b6cab74 100644
index eb5f44e30..7e8b6cab7 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -138,6 +138,14 @@ public class Main {

10
patches/server/0003-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From b1ad334c589029d1cf278ece3400f8857af16680 Mon Sep 17 00:00:00 2001
From bd5545c40e56edccbfcaf30ea8b28c6f9236fb83 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, 8 insertions(+)
diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
index 0c3ec83570..20c143e314 100644
index 0c3ec8357..20c143e31 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..20c143e314 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 6d453b6711..210c04f026 100644
index daa94187f..4c83b4931 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2173,4 +2173,11 @@ public final class CraftServer implements Server {
@@ -2189,4 +2189,11 @@ public final class CraftServer implements Server {
return net.minecraft.server.MinecraftServer.currentTick;
}
// Paper end
@@ -37,5 +37,5 @@ index 6d453b6711..210c04f026 100644
+ // Purpur end
}
--
2.24.0.rc1
2.24.0

6
patches/server/0043-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 2c5f617cc5b908f85d0a8aafb4763b97e64ee506 Mon Sep 17 00:00:00 2001
From 83c9bffd28b0101a5d15a3dc062ecabd82fea865 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
@@ -46,10 +46,10 @@ index 627177731..de0cf5c55 100644
private static void disableDropsOnCrammingDeath() {
disableDropsOnCrammingDeath = getBoolean("settings.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e514dd50c..4b555bb1c 100644
index 4c83b4931..5d324a949 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2179,5 +2179,10 @@ public final class CraftServer implements Server {
@@ -2195,5 +2195,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}

6
patches/server/0046-Add-5-second-tps-average-in-tps.patch
View File

@@ -1,4 +1,4 @@
From ab03dbf8091533a537d8d3d446dbc9c300c88dcc Mon Sep 17 00:00:00 2001
From 25752071ae4dfe9753154cf61b62d44ace87d503 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
@@ -52,10 +52,10 @@ index 587bef915..9d5ef40a0 100644
// Paper end
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4b555bb1c..262b82538 100644
index 5d324a949..fb0da17ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2012,6 +2012,7 @@ public final class CraftServer implements Server {
@@ -2028,6 +2028,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

10
patches/server/0067-Add-block-and-fluid-tick-events.patch
View File

@@ -1,4 +1,4 @@
From 3fe2fbbd1250a9665a0cf53d27b1731fe9d2aa28 Mon Sep 17 00:00:00 2001
From 9b58483c21b9f618f82e789cac99aa43b25a6626 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 23:58:56 -0500
Subject: [PATCH] Add block and fluid tick events
@@ -10,7 +10,7 @@ Subject: [PATCH] Add block and fluid tick events
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 04685efc52..0a41997edd 100644
index 67d65e8e0..abb3d2568 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -604,7 +604,7 @@ public class WorldServer extends World {
@@ -48,7 +48,7 @@ index 04685efc52..0a41997edd 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b2c62de053..b82fc8d19f 100644
index b2c62de05..b82fc8d19 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -58,6 +58,13 @@ public class PurpurWorldConfig {
@@ -66,10 +66,10 @@ index b2c62de053..b82fc8d19f 100644
private void editableSigns() {
editableSigns = getBoolean("editable-signs", editableSigns);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7654519c9e..65cf1e7016 100644
index 7b89ccbe7..5c892a694 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2396,6 +2396,24 @@ public class CraftWorld implements World {
@@ -2393,6 +2393,24 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}

6
patches/server/0069-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From cf3e04647fdfd8bbafa0d2f25174a0c6a0aaa9dd Mon Sep 17 00:00:00 2001
From 2995e429743f1cd97ae7eb189cfe8ebdd4149fcc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:43 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 65cf1e7016..bde927e35b 100644
index 5c892a694..9960504d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2412,6 +2412,11 @@ public class CraftWorld implements World {
@@ -2409,6 +2409,11 @@ public class CraftWorld implements World {
public void setFluidTickEventEnabled(boolean enabled) {
getHandle().purpurConfig.fluidTickEvent = enabled;
}

8
patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View File

@@ -1,4 +1,4 @@
From ee11f79c178ffe049354797dfdae6025ecebe5f7 Mon Sep 17 00:00:00 2001
From a2abd93861a3b9c6bfa57fe1e595198cb72de361 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,7 +9,7 @@ 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 b737a0f0ca..716a3885ac 100644
index b737a0f0c..716a3885a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1387,8 +1387,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -25,10 +25,10 @@ index b737a0f0ca..716a3885ac 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 bde927e35b..5217484d76 100644
index 9960504d0..760d32107 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -380,12 +380,16 @@ public class CraftWorld implements World {
@@ -377,12 +377,16 @@ public class CraftWorld implements World {
@Override
public boolean setSpawnLocation(int x, int y, int z) {
try {

10
patches/server/0098-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 13adbf70a09ba38f64b77b40cb5db808987850c7 Mon Sep 17 00:00:00 2001
From 159989e47b1626c5837b62e1f0e644205ab90ada Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add tick times API
3 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
index 00f79e4336..9fe2550a4c 100644
index 00f79e433..9fe2550a4 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -15,7 +15,7 @@ import java.util.Locale;
@@ -36,10 +36,10 @@ index 00f79e4336..9fe2550a4c 100644
- }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 262b82538c..2b78709262 100644
index fb0da17ed..bfc41f998 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2185,5 +2185,20 @@ public final class CraftServer implements Server {
@@ -2201,5 +2201,20 @@ public final class CraftServer implements Server {
public boolean isLagging() {
return getServer().lagging;
}
@@ -61,7 +61,7 @@ index 262b82538c..2b78709262 100644
// Purpur end
}
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 2eed9d0a4a..c29380e1c0 100644
index 2eed9d0a4..c29380e1c 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -4,6 +4,12 @@ import org.bukkit.ChatColor;

6
patches/server/0101-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 18c33002e12d6a2113daf8c1f3d49bc160145346 Mon Sep 17 00:00:00 2001
From eb8428292559cbaa3e2131d35ec07e94cd702648 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, 5 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 156d64d77..3142054d8 100644
index 760d32107..1e1b9cb32 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2421,6 +2421,11 @@ public class CraftWorld implements World {
@@ -2418,6 +2418,11 @@ public class CraftWorld implements World {
IBlockData validData = net.minecraft.server.Block.getValidBlockForPosition(((CraftBlockData) blockdata).getState(), getHandle(), net.minecraft.server.MCUtil.toBlockPosition(location));
return CraftBlockData.fromData(validData == null ? Blocks.AIR.getBlockData() : validData);
}