mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-26 22:25:40 +02:00
3f68b7f930
Previous fix for SPIGOT-1903 only applied to world changes, but many other cases of players been teleporting can cause that same bug. So call it any time setPosition is called to ensure we never falsely trigger "moved too quickly" And this commit may be considered evil to some people.
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 307c4b55c0176a16ae15583641da73bfccbc5e4e Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 10 Apr 2016 22:36:10 -0400
|
|
Subject: [PATCH] SPIGOT-1903: Update PlayerConnection on teleporting players
|
|
|
|
Otherwise the player will trigger a "moved too quickly" next movement packet
|
|
and rubber band.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index 49e6661..fb5d84f 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -288,6 +288,7 @@ public abstract class Entity implements ICommandListener {
|
|
this.locX = d0;
|
|
this.locY = d1;
|
|
this.locZ = d2;
|
|
+ if (this instanceof EntityPlayer && ((EntityPlayer) this).playerConnection != null) ((EntityPlayer) this).playerConnection.captureCurrentPosition(); // Paper
|
|
float f = this.width / 2.0F;
|
|
float f1 = this.length;
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index f0c04e5..d267a44 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -205,7 +205,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
|
|
|
}
|
|
|
|
- private void d() {
|
|
+ public void captureCurrentPosition() { d(); } private void d() { // Paper // OBFHELPER
|
|
this.l = this.player.locX;
|
|
this.m = this.player.locY;
|
|
this.n = this.player.locZ;
|
|
--
|
|
2.8.1
|
|
|