Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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:
b8372fc0 Improve handling of indestructable blocks
a2a06640 Add moon phase API
47f71aea Fix SpawnChangeEvent not firing for all use-cases
b6c860f2 Don't require FACING data
0c1716a1 Add #setMaxPlayers API
02aed275 [CI-SKIP] Require dependencies script (#4172)
1ccc1c67 Add smithing item helpers
20d9ec6b Fix MC-197271
e9287056 [CI-SKIP] Update issue templates with notices
This commit is contained in:
William Blake Galbreath
2020-08-23 16:09:37 -05:00
parent d394fce3e9
commit 949a9956ab
16 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: dccaf59a09...b8372fc0b3

2
current-paper
View File

@@ -1 +1 @@
1.16.2--1e60a83ce374a1c2d26ac5de6f44b645e7b6fc7c 1.16.2--1cf6628e5afaef6b499248059bf2babfcd28da51

4
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -37,10 +37,10 @@ index 1a34f6880..95a99b7b5 100644
<properties> <properties>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6e01bf2d5..46c4d98ce 100644 index bacb3ee9a..e9fb263b6 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1447,6 +1447,14 @@ public interface Server extends PluginMessageRecipient { @@ -1456,6 +1456,14 @@ public interface Server extends PluginMessageRecipient {
} }
// Paper end // Paper end

4
patches/api/0003-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 46c4d98ce..49dd5974d 100644 index e9fb263b6..dacdcd1f2 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1455,6 +1455,18 @@ public interface Server extends PluginMessageRecipient { @@ -1464,6 +1464,18 @@ public interface Server extends PluginMessageRecipient {
} }
// Tuinity end - add config to timings report // Tuinity end - add config to timings report

8
patches/api/0010-Bring-back-server-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 62cc1c74c..9abb3ba7f 100644 index 7fd924621..f19d865dd 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1776,4 +1776,15 @@ public final class Bukkit { @@ -1787,4 +1787,15 @@ public final class Bukkit {
public static Server.Spigot spigot() { public static Server.Spigot spigot() {
return server.spigot(); return server.spigot();
} }
@@ -25,10 +25,10 @@ index 62cc1c74c..9abb3ba7f 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 49dd5974d..1f44ee201 100644 index dacdcd1f2..ad45e2a4c 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1567,4 +1567,13 @@ public interface Server extends PluginMessageRecipient { @@ -1576,4 +1576,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull @NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals(); com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
// Paper end // Paper end

4
patches/api/0013-MoonPhase-API.patch
View File

@@ -47,10 +47,10 @@ index 000000000..f5ad98c62
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ba5e6cca0..e764f1b1c 100644 index e827e1a6f..2685dfa18 100644
--- a/src/main/java/org/bukkit/World.java --- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java
@@ -3460,6 +3460,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -3466,6 +3466,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull @NotNull
public List<Raid> getRaids(); public List<Raid> getRaids();

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9abb3ba7f..60746ff04 100644 index f19d865dd..36bb9d37e 100644
--- a/src/main/java/org/bukkit/Bukkit.java --- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1786,5 +1786,14 @@ public final class Bukkit { @@ -1797,5 +1797,14 @@ public final class Bukkit {
public static String getServerName() { public static String getServerName() {
return server.getServerName(); return server.getServerName();
} }
@@ -24,10 +24,10 @@ index 9abb3ba7f..60746ff04 100644
// Purpur end // Purpur end
} }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 1f44ee201..1b743968b 100644 index ad45e2a4c..5b04a7699 100644
--- a/src/main/java/org/bukkit/Server.java --- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java
@@ -1575,5 +1575,12 @@ public interface Server extends PluginMessageRecipient { @@ -1584,5 +1584,12 @@ public interface Server extends PluginMessageRecipient {
*/ */
@NotNull @NotNull
String getServerName(); String getServerName();

22
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -6018,7 +6018,7 @@ index f01186988..f52132604 100644
return this.j.d(); return this.j.d();
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 923efc17b..1ea026aeb 100644 index efe10b7f5..14318d046 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -51,12 +51,13 @@ import org.bukkit.event.server.MapInitializeEvent; @@ -51,12 +51,13 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -6901,7 +6901,7 @@ index ff8ba5457..ecedc167d 100644
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7d83cf39a..2acdb0807 100644 index 5f5b39b3b..2b0e1e698 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper @@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -6913,7 +6913,7 @@ index 7d83cf39a..2acdb0807 100644
private final String serverVersion; private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion(); private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft"); private final Logger logger = Logger.getLogger("Minecraft");
@@ -847,6 +847,7 @@ public final class CraftServer implements Server { @@ -854,6 +854,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -6921,7 +6921,7 @@ index 7d83cf39a..2acdb0807 100644
for (WorldServer world : console.getWorlds()) { for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty); world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -881,6 +882,7 @@ public final class CraftServer implements Server { @@ -888,6 +889,7 @@ public final class CraftServer implements Server {
} }
world.spigotConfig.init(); // Spigot world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper world.paperConfig.init(); // Paper
@@ -6929,7 +6929,7 @@ index 7d83cf39a..2acdb0807 100644
} }
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1822,7 +1824,10 @@ public final class CraftServer implements Server { @@ -1829,7 +1831,10 @@ public final class CraftServer implements Server {
@Override @Override
public boolean isPrimaryThread() { public boolean isPrimaryThread() {
@@ -6941,7 +6941,7 @@ index 7d83cf39a..2acdb0807 100644
} }
@Override @Override
@@ -2232,6 +2237,14 @@ public final class CraftServer implements Server { @@ -2239,6 +2244,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config; return com.destroystokyo.paper.PaperConfig.config;
} }
@@ -6957,10 +6957,10 @@ index 7d83cf39a..2acdb0807 100644
public void restart() { public void restart() {
org.spigotmc.RestartCommand.restart(); org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 4ab3db10e..fabc062e1 100644 index 299f57ca2..4de6252f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -336,6 +336,14 @@ public class CraftWorld implements World { @@ -341,6 +341,14 @@ public class CraftWorld implements World {
this.generator = gen; this.generator = gen;
environment = env; environment = env;
@@ -6975,7 +6975,7 @@ index 4ab3db10e..fabc062e1 100644
} }
@Override @Override
@@ -407,14 +415,7 @@ public class CraftWorld implements World { @@ -414,14 +422,7 @@ public class CraftWorld implements World {
@Override @Override
public Chunk getChunkAt(int x, int z) { public Chunk getChunkAt(int x, int z) {
@@ -6991,7 +6991,7 @@ index 4ab3db10e..fabc062e1 100644
} }
// Paper start // Paper start
@@ -497,6 +498,7 @@ public class CraftWorld implements World { @@ -504,6 +505,7 @@ public class CraftWorld implements World {
org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot org.spigotmc.AsyncCatcher.catchOp("chunk unload"); // Spigot
if (isChunkLoaded(x, z)) { if (isChunkLoaded(x, z)) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE); // Paper world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE); // Paper
@@ -6999,7 +6999,7 @@ index 4ab3db10e..fabc062e1 100644
} }
return true; return true;
@@ -2529,7 +2531,7 @@ public class CraftWorld implements World { @@ -2536,7 +2538,7 @@ public class CraftWorld implements World {
} }
return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> { return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null); net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);

24
patches/server/0003-Purpur-config-files.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 8a19c96499..de75e33a68 100644 index 8a19c9649..de75e33a6 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java --- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -581,7 +581,7 @@ public class Metrics { @@ -581,7 +581,7 @@ public class Metrics {
@@ -29,7 +29,7 @@ index 8a19c96499..de75e33a68 100644
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>(); 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 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 5907caa742..a60634fc45 100644 index 5907caa74..a60634fc4 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java --- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -168,6 +168,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -168,6 +168,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -49,7 +49,7 @@ index 5907caa742..a60634fc45 100644
// Paper end // Paper end
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4834f7569a..e9e55c6f11 100644 index 4834f7569..e9e55c6f1 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -73,7 +73,7 @@ index 4834f7569a..e9e55c6f11 100644
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644 new file mode 100644
index 0000000000..1d00832bff index 000000000..1d00832bf
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
@@ -209,7 +209,7 @@ index 0000000000..1d00832bff
+} +}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
new file mode 100644 new file mode 100644
index 0000000000..361f7857e4 index 000000000..361f7857e
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@@ -274,7 +274,7 @@ index 0000000000..361f7857e4
+} +}
diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java 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 new file mode 100644
index 0000000000..4904be939c index 000000000..4904be939
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java +++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
@@ -0,0 +1,65 @@ @@ -0,0 +1,65 @@
@@ -344,10 +344,10 @@ index 0000000000..4904be939c
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d2bf6fb5be..840f436ca2 100644 index 0b789d179..7f5493a6d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -848,6 +848,7 @@ public final class CraftServer implements Server { @@ -855,6 +855,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper 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 com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -355,7 +355,7 @@ index d2bf6fb5be..840f436ca2 100644
for (WorldServer world : console.getWorlds()) { for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty); world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals); world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -883,6 +884,7 @@ public final class CraftServer implements Server { @@ -890,6 +891,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config world.tuinityConfig.init(); // Tuinity - Server Config
@@ -363,7 +363,7 @@ index d2bf6fb5be..840f436ca2 100644
} }
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -901,6 +903,7 @@ public final class CraftServer implements Server { @@ -908,6 +910,7 @@ public final class CraftServer implements Server {
reloadData(); reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -371,7 +371,7 @@ index d2bf6fb5be..840f436ca2 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2245,6 +2248,18 @@ public final class CraftServer implements Server { @@ -2252,6 +2255,18 @@ public final class CraftServer implements Server {
} }
// Tuinity end - add config to timings report // Tuinity end - add config to timings report
@@ -391,7 +391,7 @@ index d2bf6fb5be..840f436ca2 100644
public void restart() { public void restart() {
org.spigotmc.RestartCommand.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 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 0db5338583..bdb87ffac7 100644 index b4e65963e..3261d2255 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -146,6 +146,14 @@ public class Main { @@ -146,6 +146,14 @@ public class Main {

6
patches/server/0011-Bring-back-server-name.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java
index 23f8e144fc..6797fa2e8c 100644 index 23f8e144f..6797fa2e8 100644
--- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java
+++ b/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 @@ -10,6 +10,7 @@ public class DedicatedServerProperties extends PropertyManager<DedicatedServerPr
@@ -17,10 +17,10 @@ index 23f8e144fc..6797fa2e8c 100644
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true); public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 840f436ca2..e0ac9822e4 100644 index 7f5493a6d..5b53ec0a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2397,4 +2397,11 @@ public final class CraftServer implements Server { @@ -2404,4 +2404,11 @@ public final class CraftServer implements Server {
return mobGoals; return mobGoals;
} }
// Paper end // Paper end

4
patches/server/0014-MoonPhase-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] MoonPhase API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index fabc062e19..2dbe0d6075 100644 index 4de6252f0..4c092afc4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2604,4 +2604,11 @@ public class CraftWorld implements World { @@ -2611,4 +2611,11 @@ public class CraftWorld implements World {
return spigot; return spigot;
} }
// Spigot end // Spigot end

8
patches/server/0015-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5b684affda..eee7356d5b 100644 index 5b684affd..eee7356d5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -166,6 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -25,7 +25,7 @@ index 5b684affda..eee7356d5b 100644
} }
// Tuinity - replace logic // Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 27cbfdfba8..6ff5e07834 100644 index 27cbfdfba..6ff5e0783 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig { @@ -149,6 +149,11 @@ public class PurpurConfig {
@@ -41,10 +41,10 @@ index 27cbfdfba8..6ff5e07834 100644
public static boolean enderChestSixRows = false; public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false; public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e0ac9822e4..ebc87f1c5c 100644 index 5b53ec0a9..ce543b87e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2403,5 +2403,10 @@ public final class CraftServer implements Server { @@ -2410,5 +2410,10 @@ public final class CraftServer implements Server {
public String getServerName() { public String getServerName() {
return getProperties().serverName; return getProperties().serverName;
} }

4
patches/server/0029-Silk-touch-spawners.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Silk touch spawners
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 623f8811e..0dc8aa500 100644 index a45ceff9f..d08b58473 100644
--- a/src/main/java/net/minecraft/server/Block.java --- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java
@@ -218,6 +218,7 @@ public class Block extends BlockBase implements IMaterial { @@ -223,6 +223,7 @@ public class Block extends BlockBase implements IMaterial {
} }

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Cat spawning options
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 90c37e4a8e..7a42feb16e 100644 index 90c37e4a8..7a42feb16 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java --- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -44,6 +44,7 @@ public interface IEntityAccess { @@ -44,6 +44,7 @@ public interface IEntityAccess {
@@ -17,7 +17,7 @@ index 90c37e4a8e..7a42feb16e 100644
return this.a(oclass, axisalignedbb, IEntitySelector.g); return this.a(oclass, axisalignedbb, IEntitySelector.g);
} }
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 5e17868a76..6d0ebd8afe 100644 index 5e17868a7..6d0ebd8af 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java --- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java +++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner { @@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner {
@@ -62,7 +62,7 @@ index 5e17868a76..6d0ebd8afe 100644
} }
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index adacfce6f3..21e401acd7 100644 index adacfce6f..21e401acd 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java --- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -45,6 +45,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> { @@ -45,6 +45,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -74,7 +74,7 @@ index adacfce6f3..21e401acd7 100644
return this.c(predicate, blockposition, i, villageplace_occupancy).count(); return this.c(predicate, blockposition, i, villageplace_occupancy).count();
} }
diff --git a/src/main/java/net/minecraft/server/VillagePlaceType.java b/src/main/java/net/minecraft/server/VillagePlaceType.java diff --git a/src/main/java/net/minecraft/server/VillagePlaceType.java b/src/main/java/net/minecraft/server/VillagePlaceType.java
index a5718af9b6..b6b4c8c491 100644 index a5718af9b..b6b4c8c49 100644
--- a/src/main/java/net/minecraft/server/VillagePlaceType.java --- a/src/main/java/net/minecraft/server/VillagePlaceType.java
+++ b/src/main/java/net/minecraft/server/VillagePlaceType.java +++ b/src/main/java/net/minecraft/server/VillagePlaceType.java
@@ -44,7 +44,7 @@ public class VillagePlaceType { @@ -44,7 +44,7 @@ public class VillagePlaceType {
@@ -95,10 +95,10 @@ index a5718af9b6..b6b4c8c491 100644
return this.E; return this.E;
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b0b49c866c..72958601e6 100644 index 646f9180f..53ab03a29 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2534,6 +2534,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -2536,6 +2536,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
} }
} }
@@ -107,7 +107,7 @@ index b0b49c866c..72958601e6 100644
return this.getChunkProvider().j(); return this.getChunkProvider().j();
} }
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b41d4959c1..55e609cc1c 100644 index b41d4959c..55e609cc1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,6 +111,15 @@ public class PurpurWorldConfig { @@ -111,6 +111,15 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 89f4225246..781621126e 100644 index 89f422524..781621126 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -165,7 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -165,7 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -47,10 +47,10 @@ index 89f4225246..781621126e 100644
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime; tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ebc87f1c5c..c0b1af9c44 100644 index ce543b87e..2d03e4361 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2195,6 +2195,7 @@ public final class CraftServer implements Server { @@ -2202,6 +2202,7 @@ public final class CraftServer implements Server {
@Override @Override
public double[] getTPS() { public double[] getTPS() {
return new double[] { return new double[] {
@@ -59,7 +59,7 @@ index ebc87f1c5c..c0b1af9c44 100644
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(), net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps15.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 diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
index 7218f23df4..3c7b9a6d24 100644 index 7218f23df..3c7b9a6d2 100644
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
@@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command @@ -33,7 +33,7 @@ public class TicksPerSecondCommand extends Command

10
patches/server/0128-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Crying obsidian valid for portal frames
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 0dc8aa5005..ee01dd1fdf 100644 index d08b58473..1473e13c7 100644
--- a/src/main/java/net/minecraft/server/Block.java --- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java
@@ -95,6 +95,7 @@ public class Block extends BlockBase implements IMaterial { @@ -100,6 +100,7 @@ public class Block extends BlockBase implements IMaterial {
return tag.isTagged(this); return tag.isTagged(this);
} }
@@ -17,7 +17,7 @@ index 0dc8aa5005..ee01dd1fdf 100644
return this == block; return this == block;
} }
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 05a7422fba..5e0afcdc2e 100644 index 05a7422fb..5e0afcdc2 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java --- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -636,6 +636,7 @@ public abstract class BlockBase { @@ -636,6 +636,7 @@ public abstract class BlockBase {
@@ -29,7 +29,7 @@ index 05a7422fba..5e0afcdc2e 100644
return this.getBlock().a(block); return this.getBlock().a(block);
} }
diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java diff --git a/src/main/java/net/minecraft/server/BlockPortalShape.java b/src/main/java/net/minecraft/server/BlockPortalShape.java
index b7635ab162..425ed3c85d 100644 index b7635ab16..425ed3c85 100644
--- a/src/main/java/net/minecraft/server/BlockPortalShape.java --- a/src/main/java/net/minecraft/server/BlockPortalShape.java
+++ b/src/main/java/net/minecraft/server/BlockPortalShape.java +++ b/src/main/java/net/minecraft/server/BlockPortalShape.java
@@ -14,7 +14,7 @@ import org.bukkit.event.world.PortalCreateEvent; @@ -14,7 +14,7 @@ import org.bukkit.event.world.PortalCreateEvent;
@@ -42,7 +42,7 @@ index b7635ab162..425ed3c85d 100644
private final GeneratorAccess b; private final GeneratorAccess b;
private final EnumDirection.EnumAxis c; private final EnumDirection.EnumAxis c;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index af3739c79a..d33d24af65 100644 index af3739c79..d33d24af6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -176,6 +176,7 @@ public class PurpurConfig { @@ -176,6 +176,7 @@ public class PurpurConfig {