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 appear to apply and compile correctly

Paper Changes:
fb36f15d6 Let some more packets be send immediately, closes #4140 (#4896)
ede41fe16 Emancipate more features to PlayerHandshakeEvent
3fdeba1f5 [CI-SKIP] [Auto] Rebuild Patches
5fc07bd63 Maded Title-Objects directy sendable to targets
e7b9a478e Player Chunk Load/Unload Events
1d0cfc0cc MC-4 Fix item position desync
458db6206 Limit auto recipe packets
This commit is contained in:
BillyGalbreath
2020-12-16 18:05:35 -06:00
parent 2edb086e13
commit 391f9addfd
150 changed files with 119 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8424,10 +8424,10 @@ index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369e
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 976c44c8eeecc513fa11de55b80317550f621407..27c368bf19292e1076e1990a1d733eeac33ec0f4 100644
index 7240b885d96eb2df187b6229449af1a893a4524e..2c276971d47e48b39afa176994eba5747a3a3951 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -525,6 +525,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -527,6 +527,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
}
@@ -9733,7 +9733,7 @@ index 1558c5f8256f50be6850f1d7f70eee3e8ec76496..b92ca4a6de01f3f86367fb8dfe3591b0
Vec3D vec3d = new Vec3D(((double) pathpoint.a + this.a.locX()) / 2.0D, ((double) pathpoint.b + this.a.locY()) / 2.0D, ((double) pathpoint.c + this.a.locZ()) / 2.0D);
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515f38e5395 100644
index fb1e3c705b8abee13695762cdfd0e9f1bfdb5ad8..6a0ec0105399066dede622b45c9471b32c162cf6 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -27,6 +27,8 @@ import org.apache.logging.log4j.Logger;
@@ -9849,7 +9849,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
try {
a(packet, this.packetListener);
} catch (CancelledPacketHandleException cancelledpackethandleexception) {
@@ -220,7 +310,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -222,7 +312,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
MCUtil.isMainThread() && packet.isReady() && this.packetQueue.isEmpty() &&
(packet.getExtraPackets() == null || packet.getExtraPackets().isEmpty())
))) {
@@ -9858,7 +9858,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
return;
}
// write the packets to the queue, then flush - antixray hooks there already
@@ -246,6 +336,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -248,6 +338,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
private void dispatchPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener) { this.b(packet, genericFutureListener); } // Paper - OBFHELPER
private void b(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
@@ -9873,7 +9873,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
EnumProtocol enumprotocol = EnumProtocol.a(packet);
EnumProtocol enumprotocol1 = (EnumProtocol) this.channel.attr(NetworkManager.c).get();
@@ -268,7 +366,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -270,7 +368,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
try {
// Paper end
@@ -9882,7 +9882,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
if (genericfuturelistener != null) {
channelfuture.addListener(genericfuturelistener);
@@ -288,39 +386,83 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -290,39 +388,83 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
}
// Paper end
} else {
@@ -9996,7 +9996,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
}
}
@@ -343,6 +485,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -345,6 +487,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
}
private boolean processQueue() {
if (this.packetQueue.isEmpty()) return true;
@@ -10005,7 +10005,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
// If we are on main, we are safe here in that nothing else should be processing queue off main anymore
// But if we are not on main due to login/status, the parent is synchronized on packetQueue
java.util.Iterator<QueuedPacket> iterator = this.packetQueue.iterator();
@@ -350,16 +494,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -352,16 +496,22 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
NetworkManager.QueuedPacket queued = iterator.next(); // poll -> peek
// Fix NPE (Spigot bug caused by handleDisconnection())
@@ -10030,7 +10030,7 @@ index 3ec8ba17ddf376aa98e2b74979b2544922712560..7a2a8acea90a0e6f08f366c3d397a515
}
}
return true;
@@ -436,10 +586,16 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -438,10 +588,16 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
return this.channel instanceof LocalChannel || this.channel instanceof LocalServerChannel;
}
@@ -11204,10 +11204,10 @@ index 6c399bcea03e839bf2f21e92b5d76d46b7088667..d3bf356ea768a32a5684eb851a2a0add
}
// Paper end - optimised tracker
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb9d8e8d4a 100644
index 3e1f88bce8e0ba95f73bca204549db0c65b1465e..dd2ba5d433d4aeef0ac5c0a81acb7f263104c10b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -414,7 +414,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed *= 2f; // TODO: Get the speed of the vehicle instead of the player
// Paper start - Prevent moving into unloaded chunks
@@ -11218,7 +11218,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
return;
}
@@ -1053,7 +1055,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1058,7 +1060,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
if (this.teleportPos != null) {
@@ -11227,7 +11227,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
this.A = this.e;
this.a(this.teleportPos.x, this.teleportPos.y, this.teleportPos.z, this.player.yaw, this.player.pitch);
}
@@ -1123,7 +1125,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1128,7 +1130,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
speed = player.abilities.walkSpeed * 10f;
}
// Paper start - Prevent moving into unloaded chunks
@@ -11236,7 +11236,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
this.internalTeleport(this.player.locX(), this.player.locY(), this.player.locZ(), this.player.yaw, this.player.pitch, Collections.emptySet());
return;
}
@@ -1179,6 +1181,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1184,6 +1186,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
@@ -11244,7 +11244,7 @@ index 0aac84e9800788947bb75b04307ba6fffb57dab8..1c8b477f833dbf7ba07811d3a4d80ccb
this.player.setOnGround(packetplayinflying.b()); // CraftBukkit - SPIGOT-5810, SPIGOT-5835: reset by this.player.move
// Paper start - prevent position desync
if (this.teleportPos != null) {
@@ -1203,7 +1206,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1208,7 +1211,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.player.setLocation(d4, d5, d6, f, f1);