Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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

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

@@ -6018,7 +6018,7 @@ index f01186988..f52132604 100644
return this.j.d();
}
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
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -51,12 +51,13 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -6901,7 +6901,7 @@ index ff8ba5457..ecedc167d 100644
@Override
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
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,7 +230,7 @@ import javax.annotation.Nullable; // Paper
@@ -6913,7 +6913,7 @@ index 7d83cf39a..2acdb0807 100644
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
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
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()) {
world.worldDataServer.setDifficulty(config.difficulty);
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.paperConfig.init(); // Paper
@@ -6929,7 +6929,7 @@ index 7d83cf39a..2acdb0807 100644
}
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
public boolean isPrimaryThread() {
@@ -6941,7 +6941,7 @@ index 7d83cf39a..2acdb0807 100644
}
@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;
}
@@ -6957,10 +6957,10 @@ index 7d83cf39a..2acdb0807 100644
public void 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
index 4ab3db10e..fabc062e1 100644
index 299f57ca2..4de6252f0 100644
--- a/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;
environment = env;
@@ -6975,7 +6975,7 @@ index 4ab3db10e..fabc062e1 100644
}
@Override
@@ -407,14 +415,7 @@ public class CraftWorld implements World {
@@ -414,14 +422,7 @@ public class CraftWorld implements World {
@Override
public Chunk getChunkAt(int x, int z) {
@@ -6991,7 +6991,7 @@ index 4ab3db10e..fabc062e1 100644
}
// 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
if (isChunkLoaded(x, z)) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 0, Unit.INSTANCE); // Paper
@@ -6999,7 +6999,7 @@ index 4ab3db10e..fabc062e1 100644
}
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) -> {
net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);