Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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:
e86324fe [Auto] Updated Upstream (Bukkit/Spigot)
da15798c [1.16] Optimize NetworkManager exception handling (#3819)
This commit is contained in:
William Blake Galbreath
2020-07-06 00:08:26 -05:00
parent 7ea7adf350
commit c90b1d6576
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 802b94f3d5...e86324fe11

2
current-paper
View File

@@ -1 +1 @@
1.16.1--f4a0545e767754238f68402f43b18fb8fb6038d2 1.16.1--7ea52924a37a927c9582f0ef7e2827e4e90973bc

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

@@ -2833,7 +2833,7 @@ index 9c4b02d776..17afddf4f4 100644
int j = MathHelper.floor(d1); int j = MathHelper.floor(d1);
int k = MathHelper.floor(d2); int k = MathHelper.floor(d2);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7a2140e4b9..70c2be22b7 100644 index c388999d10..4545bd371c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2835,7 +2835,11 @@ public abstract class EntityLiving extends Entity { @@ -2835,7 +2835,11 @@ public abstract class EntityLiving extends Entity {
@@ -3216,7 +3216,7 @@ index 26f230a801..eb71fa6e39 100644
public CrashReport b(CrashReport crashreport) { public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index bd33f85cfe..fa208a1959 100644 index d5cc2af83a..327bb3e744 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java --- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -71,6 +71,39 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> { @@ -71,6 +71,39 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -3892,7 +3892,7 @@ index cf83059fec..37f55c66b6 100644
} else { } else {
// CraftBukkit start - fire PlayerMoveEvent // CraftBukkit start - fire PlayerMoveEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
index eb3269e0ea..d9c9d01aef 100644 index 7ea293f38d..e698dd2260 100644
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
@@ -13,10 +13,30 @@ public class PlayerConnectionUtils { @@ -13,10 +13,30 @@ public class PlayerConnectionUtils {
@@ -3926,7 +3926,7 @@ index eb3269e0ea..d9c9d01aef 100644
if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590 if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590
if (t0.a().isConnected()) { if (t0.a().isConnected()) {
try (Timing ignored = timing.startTiming()) { // Paper - timings try (Timing ignored = timing.startTiming()) { // Paper - timings
@@ -25,6 +45,12 @@ public class PlayerConnectionUtils { @@ -40,6 +60,12 @@ public class PlayerConnectionUtils {
} else { } else {
PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet); PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
} }