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:
932e97f3 Rename to AsyncPlayerSendSuggestionsEvent to be consistent in naming
0dd19075 AsyncSendPlayerSuggestionsEvent Brigadier Event
a9e20e5f Fix being kicked in survival for block picking - Fixes #3277
4d20537e Expose game version (#3274)
85fb0015 Validate PickItem Packet and kick for invalid - Fixes #3256
5729bc71 Special case Keep Alive packets from Anti Xray
a76b7740 Improved oversized chunk data packet handling
a6f78170 Use Vanilla Bed Search for non players (Villagers)
68fb98b5 Fix 2 plugin specific issues with loot drop and pathfinders
6e41f7b7 Update Activation Range 2.0 with more villager controls
57dd3971 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-05-02 21:01:38 -05:00
parent be3ee18320
commit 4d42781bdd
19 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: a6a197b11f...932e97f345

2
current-paper
View File

@@ -1 +1 @@
1.15.2--484b6419239f44b97883dcc4b5885205749afa74
1.15.2--d3e890f5f1c3b822b2fab60de3af8bc0c3b1f16a

8
patches/api/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 748ec8f720ad952d784ed4e3931d4c9a9de1c17c Mon Sep 17 00:00:00 2001
From 23500f1f8f5d8e17be4b8e14b2ec52638b2db889 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:30:03 -0600
Subject: [PATCH] Purpur config files
@@ -9,7 +9,7 @@ Subject: [PATCH] Purpur config files
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f97..5e7e10c8f 100644
index 93d5a3f9..5e7e10c8 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -204,9 +204,13 @@ class TimingsExport extends Thread {
@@ -50,10 +50,10 @@ index 93d5a3f97..5e7e10c8f 100644
JSONObject object = new JSONObject();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9ceaac0e8..20fe14213 100644
index c3fb1c27..79543106 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1386,6 +1386,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1396,6 +1396,18 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end

20
patches/api/0005-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From 89b558740be091a89cafc861442b18d114fd2626 Mon Sep 17 00:00:00 2001
From b635caa251ca2fe802bfe3ff6c967971a2b88b93 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 b99734068..3a60094a1 100644
index 95ad0122..5d42cf62 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -851,13 +851,10 @@ public final class Bukkit {
@@ -863,13 +863,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 b99734068..3a60094a1 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 eaaf9a4e9..e8b2fe0c2 100644
index 79543106..aabf82b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -712,13 +712,10 @@ public interface Server extends PluginMessageRecipient {
@@ -722,13 +722,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.
*
@@ -50,7 +50,7 @@ index eaaf9a4e9..e8b2fe0c2 100644
public OfflinePlayer getOfflinePlayer(@NotNull String name);
diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
index 45cb8da12..383b43e1b 100644
index 45cb8da1..383b43e1 100644
--- a/src/main/java/org/bukkit/command/CommandExecutor.java
+++ b/src/main/java/org/bukkit/command/CommandExecutor.java
@@ -19,5 +19,5 @@ public interface CommandExecutor {
@@ -61,7 +61,7 @@ index 45cb8da12..383b43e1b 100644
+ public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
}
diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
index e9cf71f5c..34d3462c7 100644
index e9cf71f5..34d3462c 100644
--- a/src/main/java/org/bukkit/command/TabCompleter.java
+++ b/src/main/java/org/bukkit/command/TabCompleter.java
@@ -23,5 +23,5 @@ public interface TabCompleter {
@@ -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 d7d6a3e83..cf8d77491 100644
index d7d6a3e8..cf8d7749 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 {
@@ -100,7 +100,7 @@ index d7d6a3e83..cf8d77491 100644
ItemMeta meta = getItemMeta();
return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage();
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index 04fa3991f..24d65491c 100644
index 04fa3991..24d65491 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -122,7 +122,7 @@ index 04fa3991f..24d65491c 100644
}
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index a48be38b1..951b81e79 100644
index a48be38b..951b81e7 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -41,6 +41,11 @@ public class AnnotationTest {

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

@@ -1,4 +1,4 @@
From 3635012280c234231d996c604d2ec76269c67dd7 Mon Sep 17 00:00:00 2001
From 0b90223266a44ecb1cdaa22ec463a24d231cb174 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 9cac2d299..cd6c2f7ca 100644
index 5d42cf62..7164ff2c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1692,4 +1692,15 @@ public final class Bukkit {
@@ -1704,4 +1704,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -29,10 +29,10 @@ index 9cac2d299..cd6c2f7ca 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8f16fb0cb..60d85e233 100644
index aabf82b5..5313b152 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1487,4 +1487,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1497,4 +1497,13 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isStopping();
// Paper end

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

@@ -1,4 +1,4 @@
From 2631d1fdbeb89f1f261a0ce8480bd2c385d8d5d2 Mon Sep 17 00:00:00 2001
From f95a1f1d184934497e26f6cb76f87e0018ece82d 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 cd6c2f7ca..151de5c86 100644
index 7164ff2c..a5cc0944 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1702,5 +1702,14 @@ public final class Bukkit {
@@ -1714,5 +1714,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -28,10 +28,10 @@ index cd6c2f7ca..151de5c86 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 60d85e233..a013eb2b9 100644
index 5313b152..86ffcf87 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1495,5 +1495,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1505,5 +1505,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();

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

@@ -1,4 +1,4 @@
From e008b74695e3e9846fce63c0db40959ec7683784 Mon Sep 17 00:00:00 2001
From b483582f1d4a909f42738dfdf079a2f9166a8c39 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
@@ -364,10 +364,10 @@ index 000000000..7d983d9a5
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d98011b6e..0d0058c94 100644
index 8cf8a46a7..55f157433 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -807,6 +807,7 @@ public final class CraftServer implements Server {
@@ -814,6 +814,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
@@ -375,7 +375,7 @@ index d98011b6e..0d0058c94 100644
for (WorldServer world : console.getWorlds()) {
world.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -835,6 +836,7 @@ public final class CraftServer implements Server {
@@ -842,6 +843,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -383,7 +383,7 @@ index d98011b6e..0d0058c94 100644
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -853,6 +855,7 @@ public final class CraftServer implements Server {
@@ -860,6 +862,7 @@ public final class CraftServer implements Server {
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -391,7 +391,7 @@ index d98011b6e..0d0058c94 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2093,6 +2096,18 @@ public final class CraftServer implements Server {
@@ -2100,6 +2103,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

6
patches/server/0007-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 7c346b610d849a6e4c336cfce086c7935af9b3c2 Mon Sep 17 00:00:00 2001
From 774014565ecf69c694e3f94091d3de52240e49d3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -5185,10 +5185,10 @@ index c4aa38ddf..3d52a396e 100644
return f1 + f * (f2 - f1);
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
index 134f7d001..d65979673 100644
index 93009d83f..1a8ebb673 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
@@ -28,6 +28,7 @@ public abstract class PathfinderGoal {
@@ -29,6 +29,7 @@ public abstract class PathfinderGoal {
public void e() {}

6
patches/server/0031-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 77a11eb46e61acf65386735d5e4f30e403e53b40 Mon Sep 17 00:00:00 2001
From cb78e7772e58a87b4ddd5dc5488ff2b12a686aee Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -23,10 +23,10 @@ index db54bcc7e..192ec4378 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 38ec22f4c..940acf07c 100644
index 02bda8bee..2e6411100 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2599,6 +2599,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2614,6 +2614,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end

8
patches/server/0032-Campfires-have-regen-effect.patch
View File

@@ -1,4 +1,4 @@
From 0df012f549c0e7424ebd2f19a31c43f8a995a651 Mon Sep 17 00:00:00 2001
From 3f8e50fb578ffdc4e0d49e38df733f949f090bbc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Campfires have regen effect
@@ -52,10 +52,10 @@ index ea245de18..10c222ddb 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 2f9a73ea3..2398499bc 100644
index b56b021b4..fcc5a5c23 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -92,6 +92,7 @@ public class EntityPotion extends EntityProjectile {
} else {
this.a(list, movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.ENTITY ? ((MovingObjectPositionEntity) movingobjectposition).getEntity() : null);
}
@@ -63,7 +63,7 @@ index 2f9a73ea3..2398499bc 100644
}
int i = potionregistry.b() ? 2007 : 2002;
@@ -100,6 +101,31 @@ public class EntityPotion extends EntityProjectile {
@@ -101,6 +102,31 @@ public class EntityPotion extends EntityProjectile {
}
}

10
patches/server/0037-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From edfef3a8ba11f70379845c75a0afe5caa89b4432 Mon Sep 17 00:00:00 2001
From c3a713fef3eb8bae961209d6dad09202bac0657e 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] Implement AFK API
@@ -171,7 +171,7 @@ index 1398c47a2..0bf1a14b7 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 940acf07c..68ec9b5f3 100644
index 2e6411100..1cfe6709c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -235,6 +235,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -196,7 +196,7 @@ index 940acf07c..68ec9b5f3 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1120,6 +1128,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1135,6 +1143,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -276,10 +276,10 @@ index 3515b7268..00f7fc3ec 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 92f19fcbb..7b1b0c767 100644
index d873b8cf3..9d9cc06f0 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -216,6 +216,7 @@ public class ActivationRange
@@ -207,6 +207,7 @@ public class ActivationRange
{
player.activatedTick = MinecraftServer.currentTick;

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

@@ -1,4 +1,4 @@
From f004dc243cc99e23afb84fb4a81290463484fd90 Mon Sep 17 00:00:00 2001
From 9aa393207648724027cfaf417dc35ced06f803f7 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 c9cf6f3bb..08d8e321b 100644
private static void dontSendUselessEntityPackets() {
dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0d0058c94..1d684a5e4 100644
index 55f157433..44b3dca47 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2239,4 +2239,11 @@ public final class CraftServer implements Server {
@@ -2246,4 +2246,11 @@ public final class CraftServer implements Server {
return net.minecraft.server.MinecraftServer.getServer().hasStopped();
}
// Paper end

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

@@ -1,4 +1,4 @@
From 5df02f81feef148287203e7c878c1e827cd206b5 Mon Sep 17 00:00:00 2001
From 4ec72eea0a0d8df4c68aab0c857d79a81f05dc8b 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 0c3ec8357..309f5562b 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 1d684a5e4..963e63271 100644
index 44b3dca47..68c7dbdb8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2241,6 +2241,11 @@ public final class CraftServer implements Server {
@@ -2248,6 +2248,11 @@ public final class CraftServer implements Server {
// Paper end
// Purpur start

6
patches/server/0060-Alternative-Keepalive-Handling.patch
View File

@@ -1,4 +1,4 @@
From bb274a1b8e9b969f078a8f4c99853e23e57be53a Mon Sep 17 00:00:00 2001
From 3b007b468d4ade7d84f2f05ba7fdf11716a9c625 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 11 Oct 2019 00:17:39 -0500
Subject: [PATCH] Alternative Keepalive Handling
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 68ec9b5f3..9c380f87d 100644
index 1cfe6709c..d89a30659 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index 68ec9b5f3..9c380f87d 100644
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2636,6 +2652,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2651,6 +2667,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

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

@@ -1,4 +1,4 @@
From f14226611026de57b0faaea14f9e3bae07da3c2a Mon Sep 17 00:00:00 2001
From e00e22ff6a8e6136bcfd11c1676a18390433cca8 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, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c9e533094..677cb0e46 100644
index ac257d50d..bb529b33d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2463,6 +2463,14 @@ public class CraftWorld implements World {
@@ -2461,6 +2461,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

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

@@ -1,4 +1,4 @@
From 881912510a929bed8405b0c2eaa6fd61ff84b0d2 Mon Sep 17 00:00:00 2001
From 39d262aad7cbbe16598bdee9f7107a7708e988b2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:30:17 -0600
Subject: [PATCH] Add getPlacementBlockData to World
@@ -66,10 +66,10 @@ index 9c9b93f28..74a722cce 100644
public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 677cb0e46..83bd0a95d 100644
index bb529b33d..b28684c5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2469,6 +2469,11 @@ public class CraftWorld implements World {
@@ -2467,6 +2467,11 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}

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

@@ -1,4 +1,4 @@
From 3c13882923a180b10da8aec04b8d71f6386a68a1 Mon Sep 17 00:00:00 2001
From a1fd8828f3b58853f6a00532529360299d277870 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 4d25bd747..7a7c9213d 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 963e63271..4916bdce4 100644
index 68c7dbdb8..bec429414 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2051,6 +2051,7 @@ public final class CraftServer implements Server {
@@ -2058,6 +2058,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

12
patches/server/0105-Add-more-timings-timers.patch
View File

@@ -1,4 +1,4 @@
From 1767f61d72f43905c9c69f8a39ba2fed1990a8aa Mon Sep 17 00:00:00 2001
From 34f82044e292a66771ff5eccf4dadf2d3f8a3c97 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 02:36:45 -0500
Subject: [PATCH] Add more timings timers
@@ -164,10 +164,10 @@ index e9ef6d00c..29b60e287 100644
// Purpur start
if (EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0) {
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 90319909e..ab51ef429 100644
index 84d2abbcb..602b465f1 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
@@ -77,6 +77,7 @@ public class PathfinderGoalSelector {
@@ -78,6 +78,7 @@ public class PathfinderGoalSelector {
private static final PathfinderGoal.Type[] PATHFINDER_GOAL_TYPES = PathfinderGoal.Type.values(); // Paper - remove streams from pathfindergoalselector
public void doTick() {
@@ -175,7 +175,7 @@ index 90319909e..ab51ef429 100644
this.e.enter("goalCleanup");
// Paper start - remove streams from pathfindergoalselector
for (Iterator<PathfinderGoalWrapped> iterator = this.d.iterator(); iterator.hasNext();) {
@@ -96,8 +97,10 @@ public class PathfinderGoalSelector {
@@ -97,8 +98,10 @@ public class PathfinderGoalSelector {
}
});
@@ -186,7 +186,7 @@ index 90319909e..ab51ef429 100644
// Paper start - remove streams from pathfindergoalselector
goal_update_loop: for (Iterator<PathfinderGoalWrapped> iterator = this.d.iterator(); iterator.hasNext();) {
PathfinderGoalWrapped wrappedGoal = iterator.next();
@@ -140,8 +143,10 @@ public class PathfinderGoalSelector {
@@ -141,8 +144,10 @@ public class PathfinderGoalSelector {
wrappedGoal.c();
}
// Paper end - remove streams from pathfindergoalselector
@@ -197,7 +197,7 @@ index 90319909e..ab51ef429 100644
// Paper start - remove streams from pathfindergoalselector
for (Iterator<PathfinderGoalWrapped> iterator = this.d.iterator(); iterator.hasNext();) {
PathfinderGoalWrapped wrappedGoal = iterator.next();
@@ -150,6 +155,7 @@ public class PathfinderGoalSelector {
@@ -151,6 +156,7 @@ public class PathfinderGoalSelector {
}
}
// Paper end - remove streams from pathfindergoalselector

6
patches/server/0124-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 75594bce9db8a7086286dee1fc3c018dd8d9937a Mon Sep 17 00:00:00 2001
From 4692fd99f07ec237c162c84fb54ba85e3662cff5 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
@@ -75,10 +75,10 @@ index 2453f0149..b4652a2c2 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 9c380f87d..fd0a49713 100644
index d89a30659..5065a6aa9 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1507,6 +1507,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1522,6 +1522,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];