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:
a96d3e89 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-01 20:56:22 -05:00
parent 3b4e44ff44
commit eed34befaa
10 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 0823d3fdce...a96d3e8984

2
current-paper
View File

@@ -1 +1 @@
1.16.1--6b6bdc9c691dfb9f7ccb8bdb857a31df625170ae
1.16.1--0f70ad61e0d7d5243f42ee82c938cf793a9d75ae

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

@@ -1,4 +1,4 @@
From cf1df09b2a81a4e2d37f240578d2b4cb330887b7 Mon Sep 17 00:00:00 2001
From 049e07a77b3110ad4685e5e2ffc797f7410a1650 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:53:58 -0800
Subject: [PATCH] Tuinity Server Changes
@@ -6715,10 +6715,10 @@ index 4ec53a54e..31c81b4b5 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3bbc2d78b..cebcb845b 100644
index 56bf840e3..2d042e058 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -6727,7 +6727,7 @@ index 3bbc2d78b..cebcb845b 100644
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -846,6 +846,7 @@ public final class CraftServer implements Server {
@@ -848,6 +848,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
@@ -6735,7 +6735,7 @@ index 3bbc2d78b..cebcb845b 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -880,6 +881,7 @@ public final class CraftServer implements Server {
@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -6743,7 +6743,7 @@ index 3bbc2d78b..cebcb845b 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -1817,7 +1819,10 @@ public final class CraftServer implements Server {
@@ -1821,7 +1823,10 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -6755,7 +6755,7 @@ index 3bbc2d78b..cebcb845b 100644
}
@Override
@@ -2204,6 +2209,14 @@ public final class CraftServer implements Server {
@@ -2208,6 +2213,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

6
patches/server/0002-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From 1785535c59fd991e1c0eeb05bd4834135cb1cfbe Mon Sep 17 00:00:00 2001
From eecd43452be61d472ae36cbaf2a54f3fdd83a8f9 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
@@ -243,10 +243,10 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cebcb845b..56a2db25f 100644
index 2d042e058..a083aeb5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -229,7 +229,7 @@ import javax.annotation.Nullable; // Paper
@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
From a3d3e58ef40bbd5ccd54c189cd411a952c752593 Mon Sep 17 00:00:00 2001
From 5b76af39666ae3487ad49feb5cd0a09f8838c05e 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
@@ -355,10 +355,10 @@ index 000000000..4904be939
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 56a2db25f..957baebc4 100644
index a083aeb5d..efa1b59fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -847,6 +847,7 @@ public final class CraftServer implements Server {
@@ -849,6 +849,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
@@ -366,7 +366,7 @@ index 56a2db25f..957baebc4 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -882,6 +883,7 @@ public final class CraftServer implements Server {
@@ -884,6 +885,7 @@ public final class CraftServer implements Server {
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
world.tuinityConfig.init(); // Tuinity - Server Config
@@ -374,7 +374,7 @@ index 56a2db25f..957baebc4 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -900,6 +902,7 @@ public final class CraftServer implements Server {
@@ -902,6 +904,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -382,7 +382,7 @@ index 56a2db25f..957baebc4 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2217,6 +2220,18 @@ public final class CraftServer implements Server {
@@ -2221,6 +2224,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report

8
patches/server/0009-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 9cd56eb534d4b80984130f44742196cab273b9c4 Mon Sep 17 00:00:00 2001
From 861ae1057019a5d8827a2dda7809616009d012ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] AFK API
@@ -266,7 +266,7 @@ index fc38163b1..cc08ad33e 100644
private static void timingsSettings() {
timingsUrl = getString("settings.timings.url", timingsUrl);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8c4b5f514..9ec1c5ce8 100644
index 361f7857e..2578a4677 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -56,4 +56,15 @@ public class PurpurWorldConfig {
@@ -286,10 +286,10 @@ index 8c4b5f514..9ec1c5ce8 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c7b4e5f2a..0ca6763ce 100644
index 8f2b84a84..e8c8ba74b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2143,4 +2143,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2149,4 +2149,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end

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

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

6
patches/server/0014-Lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 2e657e19a4d8355da8e9c4fd5199b116b6bf83a7 Mon Sep 17 00:00:00 2001
From d256e1dc2312caab32b822712bd426e35d087581 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Lagging threshold
@@ -46,10 +46,10 @@ index 3d779b0dc..d8b826f6b 100644
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e7d60c114..a1130d169 100644
index b50a6eea3..44e416501 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2375,5 +2375,10 @@ public final class CraftServer implements Server {
@@ -2379,5 +2379,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}

8
patches/server/0025-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From d30691f6fe7bd486962d98a4ce81e115ce8237c1 Mon Sep 17 00:00:00 2001
From 782c29bce0fea7efdaf48b9c1f23a6258a694fd2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
@@ -99,7 +99,7 @@ index 3c5ba8f2f..5807e77da 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9ec1c5ce8..1c9393f28 100644
index 2578a4677..c441fcea9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -115,10 +115,10 @@ index 9ec1c5ce8..1c9393f28 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0ca6763ce..8dc0aeb3b 100644
index e8c8ba74b..14a5a4072 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2159,5 +2159,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2165,5 +2165,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetIdleTimer();
}

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

@@ -1,4 +1,4 @@
From 17c9f3c75b390a40743295f7365d1fd2b7d9920b Mon Sep 17 00:00:00 2001
From fc287d75839f8114bab6c97c2c32c68a5d24411a 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 5acd2a97c..6c0854623 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 a1130d169..fd87db422 100644
index 44e416501..6939d767b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2167,6 +2167,7 @@ public final class CraftServer implements Server {
@@ -2171,6 +2171,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {