geforkt von Mirrors/Paper
4104545b11
"It was from a different time before books were as jank as they are now. As time has gone on they've only proven to be worse and worse."
66 Zeilen
4.5 KiB
Diff
66 Zeilen
4.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
|
Date: Sun, 17 May 2020 23:47:33 -0700
|
|
Subject: [PATCH] Fix for large move vectors crashing server
|
|
|
|
Check movement distance also based on current position.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index 32106de96d13b4d5be08c3c85b1e57d3552e9429..3db026216308628321a334ccb64b0ea97e524393 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -507,19 +507,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
|
|
|
if (entity != this.player && entity.getControllingPassenger() == this.player && entity == this.lastVehicle) {
|
|
ServerLevel worldserver = this.player.getLevel();
|
|
- double d0 = entity.getX();
|
|
- double d1 = entity.getY();
|
|
- double d2 = entity.getZ();
|
|
- double d3 = ServerGamePacketListenerImpl.clampHorizontal(packet.getX());
|
|
- double d4 = ServerGamePacketListenerImpl.clampVertical(packet.getY());
|
|
- double d5 = ServerGamePacketListenerImpl.clampHorizontal(packet.getZ());
|
|
+ double d0 = entity.getX();final double fromX = d0; // Paper - OBFHELPER
|
|
+ double d1 = entity.getY();final double fromY = d1; // Paper - OBFHELPER
|
|
+ double d2 = entity.getZ();final double fromZ = d2; // Paper - OBFHELPER
|
|
+ double d3 = ServerGamePacketListenerImpl.clampHorizontal(packet.getX());final double toX = d3; // Paper - OBFHELPER
|
|
+ double d4 = ServerGamePacketListenerImpl.clampVertical(packet.getY());final double toY = d4; // Paper - OBFHELPER
|
|
+ double d5 = ServerGamePacketListenerImpl.clampHorizontal(packet.getZ());final double toZ = d5; // Paper - OBFHELPER
|
|
float f = Mth.wrapDegrees(packet.getYRot());
|
|
float f1 = Mth.wrapDegrees(packet.getXRot());
|
|
double d6 = d3 - this.vehicleFirstGoodX;
|
|
double d7 = d4 - this.vehicleFirstGoodY;
|
|
double d8 = d5 - this.vehicleFirstGoodZ;
|
|
double d9 = entity.getDeltaMovement().lengthSqr();
|
|
- double d10 = d6 * d6 + d7 * d7 + d8 * d8;
|
|
+ // Paper start - fix large move vectors killing the server
|
|
+ double currDeltaX = toX - fromX;
|
|
+ double currDeltaY = toY - fromY;
|
|
+ double currDeltaZ = toZ - fromZ;
|
|
+ double d10 = Math.max(d6 * d6 + d7 * d7 + d8 * d8, (currDeltaX * currDeltaX + currDeltaY * currDeltaY + currDeltaZ * currDeltaZ) - 1);
|
|
+ // Paper end - fix large move vectors killing the server
|
|
|
|
|
|
// CraftBukkit start - handle custom speeds and skipped ticks
|
|
@@ -1252,14 +1257,19 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
|
|
float prevPitch = this.player.getXRot();
|
|
// CraftBukkit end
|
|
double d3 = this.player.getX(); final double toX = d3; // Paper - OBFHELPER
|
|
- double d4 = this.player.getY();
|
|
+ double d4 = this.player.getY(); final double toY = d4; // Paper - OBFHELPER
|
|
double d5 = this.player.getZ(); final double toZ = d5; // Paper - OBFHELPER
|
|
double d6 = this.player.getY();
|
|
double d7 = d0 - this.firstGoodX;
|
|
double d8 = d1 - this.firstGoodY;
|
|
double d9 = d2 - this.firstGoodZ;
|
|
double d10 = this.player.getDeltaMovement().lengthSqr();
|
|
- double d11 = d7 * d7 + d8 * d8 + d9 * d9;
|
|
+ // Paper start - fix large move vectors killing the server
|
|
+ double currDeltaX = toX - prevX;
|
|
+ double currDeltaY = toY - prevY;
|
|
+ double currDeltaZ = toZ - prevZ;
|
|
+ double d11 = Math.max(d7 * d7 + d8 * d8 + d9 * d9, (currDeltaX * currDeltaX + currDeltaY * currDeltaY + currDeltaZ * currDeltaZ) - 1);
|
|
+ // Paper end - fix large move vectors killing the server
|
|
|
|
if (this.player.isSleeping()) {
|
|
if (d11 > 1.0D) {
|