Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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:
97f920bf Fix suggest-player-names-when-null-tab-completions - Fixes #3803
166e52b5 [CI-SKIP] [Auto] Rebuild Patches
5a17ba07 Implements #3761 - Add entity liquid API (#3762)
e0cae289 Fix anvils bug - Fixes #3802
4793f774 Move bedrock config under unsupported, add comments to these configs
adf1de58 Allow delegation to vanilla chunk gen
40ace3f7 Allow delegation to vanilla chunk gen
178a6e50 Add PrepareResultEvent (#3776)
57697cd5 Report proxy onlinde mode to bstats as online (#3093)
6579ce05 Fix #3701 - Loottables erasing on viewing
030da7b8 [CI-SKIP] [Auto] Rebuild Patches
d43def79 Incorrect spawn reason for monsters from spawner - Fixes #3708 (#3764)
97b59df9 [Auto] Updated Upstream (CraftBukkit)
0543f051 [CI-SKIP] [Auto] Rebuild Patches
f3cd94c4 Remove streams from classes related to villager gossip (#3748)
b49104db add EntityTargetLivingEntityEvent for new 1.16 mobs (#3782)
4faf9703 Fix /plugins list not alphabetical to players (#3790)
7e03e44e [CI-SKIP] [Auto] Rebuild Patches
8bb00272 Update itemstack legacy name and lore (#3741)
6c87b6a0 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-05 02:45:06 -05:00
parent d337d76150
commit 329fb0f5ce
31 changed files with 203 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Tuinity API Changes
diff --git a/pom.xml b/pom.xml
index dfc7c2f3..12a5e929 100644
index 06aa32269..d04593fee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
@@ -34,10 +34,10 @@ index dfc7c2f3..12a5e929 100644
<properties>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b464cc1a..959e4e7e 100644
index 0653e0ffe..65a40c4a9 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1424,6 +1424,14 @@ public interface Server extends PluginMessageRecipient {
@@ -1438,6 +1438,14 @@ public interface Server extends PluginMessageRecipient {
}
// 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
index 959e4e7e..a5262420 100644
index 65a40c4a9..9d18c3d3b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1432,6 +1432,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1446,6 +1446,18 @@ public interface Server extends PluginMessageRecipient {
}
// 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
index 329e2dd1..4f6f0193 100644
index 4e92ce182..40c8de479 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1749,4 +1749,15 @@ public final class Bukkit {
@@ -1765,4 +1765,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 329e2dd1..4f6f0193 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a5262420..e3808a79 100644
index 9d18c3d3b..e21ce51d5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1544,4 +1544,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1558,4 +1558,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
com.destroystokyo.paper.entity.ai.MobGoals getMobGoals();
// Paper end

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
index 4f6f0193..4c410f6e 100644
index 40c8de479..be99ddd5e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1759,5 +1759,14 @@ public final class Bukkit {
@@ -1775,5 +1775,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 4f6f0193..4c410f6e 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e3808a79..d8c81767 100644
index e21ce51d5..cde8376e2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1552,5 +1552,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1566,5 +1566,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();

33
patches/api/0029-Correctly-sort-plugins-list-for-player-commandsender.patch
View File

@@ -1,33 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Jul 2020 13:49:56 -0500
Subject: [PATCH] Correctly sort /plugins list for player commandsenders
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index 665211cb1..fb58bdc81 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -90,11 +90,19 @@ public class PluginsCommand extends BukkitCommand {
// Spigot start
@NotNull
private BaseComponent[] getPluginListSpigot() {
- Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
- ComponentBuilder pluginList = new ComponentBuilder("Plugins (" + plugins.length + "): ");
+ // Purpur start
+ TreeMap<String, Plugin> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+ plugins.put(plugin.getDescription().getName(), plugin);
+ }
+ ComponentBuilder pluginList = new ComponentBuilder("Plugins (" + plugins.size() + "): ");
+ // Purpur end
int index = 0;
- for (Plugin plugin : plugins) {
+ // Purpur start
+ for (Map.Entry<String, Plugin> entry : plugins.entrySet()) {
+ Plugin plugin = entry.getValue();
+ // Purpur end
if (index++ > 0) {
pluginList.append(", ", FormatRetention.NONE).color(net.md_5.bungee.api.ChatColor.WHITE);
}