Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +02: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:
7358bf02 [Auto] Updated Upstream (CraftBukkit/Spigot)
8df6e39b [CI-SKIP] Fix version for groovy artifact (1.16.4) (#4730)
0e73fdbf OBFHELPERS (#4733)
This commit is contained in:
William Blake Galbreath
2020-11-04 13:08:22 -06:00
parent f15d3f0497
commit f0b8bd76a6
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0009-AFK-API.patch
View File

@@ -154,7 +154,7 @@ index 31eb6868c2..9f9d9b2de8 100644
// 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 490626ecd3..57e22552e0 100644
index b89caa8ad1..4365d0bbb5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -247,6 +247,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -179,7 +179,7 @@ index 490626ecd3..57e22552e0 100644
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1201,7 +1209,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1203,7 +1211,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;
@@ -188,7 +188,7 @@ index 490626ecd3..57e22552e0 100644
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1240,6 +1248,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1242,6 +1250,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -268,10 +268,10 @@ index 361f7857e4..2578a4677d 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 018afcd420..d76b167f5e 100644
index f4f4e29f56..93c8f9fc8d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2206,4 +2206,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2216,4 +2216,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end