2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Joseph Hirschfeld <joe@ibj.io>
|
|
|
|
Date: Thu, 3 Mar 2016 02:48:12 -0600
|
|
|
|
Subject: [PATCH] Add velocity warnings
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2023-02-19 15:57:10 +01:00
|
|
|
index 44cd9d5bccdc751dc9fb72a39f12e74a99133783..a290b298e24e8c4be08e7c720c10c9a83115eebf 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2023-02-19 15:57:10 +01:00
|
|
|
@@ -294,6 +294,7 @@ public final class CraftServer implements Server {
|
2021-06-11 14:02:28 +02:00
|
|
|
public boolean ignoreVanillaPermissions = false;
|
|
|
|
private final List<CraftPlayer> playerView;
|
|
|
|
public int reloadCount;
|
|
|
|
+ public static Exception excessiveVelEx; // Paper - Velocity warnings
|
|
|
|
|
|
|
|
static {
|
|
|
|
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2022-12-07 19:32:25 +01:00
|
|
|
index 62c2780b165a520e85f17fdf5c0d1c29b7579ebc..91c0354f554edbf2fc68748a8fbf182cd8d93de5 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2022-12-07 19:32:25 +01:00
|
|
|
@@ -454,10 +454,40 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2021-06-11 14:02:28 +02:00
|
|
|
public void setVelocity(Vector velocity) {
|
|
|
|
Preconditions.checkArgument(velocity != null, "velocity");
|
|
|
|
velocity.checkFinite();
|
|
|
|
+ // Paper start - Warn server owners when plugins try to set super high velocities
|
2022-02-28 21:34:23 +01:00
|
|
|
+ if (!(this instanceof org.bukkit.entity.Projectile || this instanceof org.bukkit.entity.Minecart) && isUnsafeVelocity(velocity)) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ CraftServer.excessiveVelEx = new Exception("Excessive velocity set detected: tried to set velocity of entity " + entity.getScoreboardName() + " id #" + getEntityId() + " to (" + velocity.getX() + "," + velocity.getY() + "," + velocity.getZ() + ").");
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-06-12 02:57:04 +02:00
|
|
|
this.entity.setDeltaMovement(CraftVector.toNMS(velocity));
|
2021-06-11 14:02:28 +02:00
|
|
|
entity.hurtMarked = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ /**
|
|
|
|
+ * Checks if the given velocity is not necessarily safe in all situations.
|
|
|
|
+ * This function returning true does not mean the velocity is dangerous or to be avoided, only that it may be
|
|
|
|
+ * a detriment to performance on the server.
|
|
|
|
+ *
|
|
|
|
+ * It is not to be used as a hard rule of any sort.
|
|
|
|
+ * Paper only uses it to warn server owners in watchdog crashes.
|
|
|
|
+ *
|
|
|
|
+ * @param vel incoming velocity to check
|
|
|
|
+ * @return if the velocity has the potential to be a performance detriment
|
|
|
|
+ */
|
|
|
|
+ private static boolean isUnsafeVelocity(Vector vel) {
|
|
|
|
+ final double x = vel.getX();
|
|
|
|
+ final double y = vel.getY();
|
|
|
|
+ final double z = vel.getZ();
|
|
|
|
+
|
|
|
|
+ if (x > 4 || x < -4 || y > 4 || y < -4 || z > 4 || z < -4) {
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public double getHeight() {
|
2021-06-12 02:57:04 +02:00
|
|
|
return this.getHandle().getBbHeight();
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
2022-09-26 10:02:51 +02:00
|
|
|
index 11d7ede26b46d0bf9cced65e8c3bcc41c8b66dbf..3ad14bf0697e682a2e777baa8faeb323d127fb13 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
2022-09-26 10:02:51 +02:00
|
|
|
@@ -80,7 +80,19 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
2021-06-11 14:02:28 +02:00
|
|
|
log.log( Level.SEVERE, "During the run of the server, a physics stackoverflow was supressed" );
|
|
|
|
log.log( Level.SEVERE, "near " + net.minecraft.world.level.Level.lastPhysicsProblem );
|
|
|
|
}
|
|
|
|
- //
|
|
|
|
+ // Paper start - Warn in watchdog if an excessive velocity was ever set
|
|
|
|
+ if ( org.bukkit.craftbukkit.CraftServer.excessiveVelEx != null )
|
|
|
|
+ {
|
|
|
|
+ log.log( Level.SEVERE, "------------------------------" );
|
|
|
|
+ log.log( Level.SEVERE, "During the run of the server, a plugin set an excessive velocity on an entity" );
|
|
|
|
+ log.log( Level.SEVERE, "This may be the cause of the issue, or it may be entirely unrelated" );
|
|
|
|
+ log.log( Level.SEVERE, org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getMessage());
|
|
|
|
+ for ( StackTraceElement stack : org.bukkit.craftbukkit.CraftServer.excessiveVelEx.getStackTrace() )
|
|
|
|
+ {
|
|
|
|
+ log.log( Level.SEVERE, "\t\t" + stack );
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
log.log( Level.SEVERE, "------------------------------" );
|
|
|
|
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
|
2022-09-26 10:02:51 +02:00
|
|
|
io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper // Paper - rewrite chunk system
|