Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +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:
d5cb9308f fix #5224
d23f8b62e fix? #5222
0f2575de2 fix? #5222
7c3499702 fix? #5218
c8eec830b fix #5217
a235c77ce Adventure 4.5.0
This commit is contained in:
jmp
2021-02-22 04:42:43 -08:00
parent 55af1079b5
commit 274c7b2ccc
15 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853df50a454d 100644
index 9bd88a7a42ede0029b79eae51a4b7acf1db3fc97..7034f2d09b7e9911cba7834832a901389e6690dc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -252,6 +252,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -165,7 +165,7 @@ index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853d
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
@@ -517,6 +523,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -521,6 +527,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -174,7 +174,7 @@ index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853d
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1253,7 +1261,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1257,7 +1265,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
flag1 = true; // Tuinity - diff on change, this should be moved wrongly
@@ -183,7 +183,7 @@ index 8c8359bb696afb579796b23a4d26708986c1b6e2..72bd179a0b2a07be3924b37fa9fb853d
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1303,6 +1311,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1307,6 +1315,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();