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:
PaperMC/Paper@a5be178 Use correct toX/Y/Z in player move packet handling
This commit is contained in:
BillyGalbreath
2022-03-14 19:07:36 -05:00
parent eaff9b6719
commit 5850d9fb6a
13 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ index 2ec7392b94e6351190a72e59fac49a883a058752..b2e9d6a2ee654caa6e129d63a6e23f88
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 d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d287a07ebf 100644
index 334e73a646bb02fcfef331229a07e790d9ec6c67..81de9d96c1d3b36a3616ba824878c04b4d4fa745 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -292,6 +292,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -105,7 +105,7 @@ index d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d2
this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
this.disconnect(new TranslatableComponent("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
}
@@ -667,6 +687,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -676,6 +696,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -114,7 +114,7 @@ index d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d2
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1439,7 +1461,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1448,7 +1470,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
flag2 = true; // Paper - diff on change, this should be moved wrongly
@@ -123,7 +123,7 @@ index d61e30e19c1144a3610f92028c047e0f11a13aa9..1646852179a41da2380b0b67cbb183d2
}
this.player.absMoveTo(d0, d1, d2, f, f1);
@@ -1489,6 +1511,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1498,6 +1520,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -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 60120fcfc2127a53d90ce5bd3a819eb76801c9e8..eaadaa3a20d05f020d683a418fc0eab3e2bbac77 100644
index e13b2b88e427aba1c4e6a924f4c8474d60976eb1..0228eb3bd816c35fcf4607f0a140b1e6ef56decd 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -196,6 +196,13 @@ public abstract class Player extends LivingEntity {