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 ()

Browse Source 
Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c347e5df53355b88bf3f69c0d4e95b48678e95dc..9003c702af7763b7fcfea27b2caab1df16d4edc5 100644
index d35eee8011e0c1a8b2885054597cfd88b1192795..e00aa16f51ec065cdce13dff0926d87e49561c8b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2020,8 +2020,58 @@ public class ServerPlayer extends Player {
@@ -2022,8 +2022,58 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();
@@ -68,7 +68,7 @@ index c347e5df53355b88bf3f69c0d4e95b48678e95dc..9003c702af7763b7fcfea27b2caab1df
return this.stats;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index f8c0df22fec9ec08d7346c3d872fa53ff0fa31eb..0d2b7ee97faf4751580eebbf3badbbfe2d0865d0 100644
index e21646cb6975615fb7a76251e5e1c969990c0036..c6448b2281b01aa445f58b289f893c100df01935 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -342,6 +342,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -182,7 +182,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b
if (baseEntity == null) {
if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f11ba32019abb5d5fef13c8f1beab18f34181a75..74ef0579739cdc6961718dd2d2b34752f172ed73 100644
index 7d0dcb65544ac20faa5dceb5cb97191b06f3800b..265d6b766001cdb8e8b9bc8538119637dd92cd17 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -202,6 +202,13 @@ public abstract class Player extends LivingEntity {