2017-05-28 05:06:26 +00:00
|
|
|
From 3ae56f998b55e3a503566891a5006dfd11c3dbd5 Mon Sep 17 00:00:00 2001
|
2016-02-29 23:09:49 +00:00
|
|
|
From: Joseph Hirschfeld <joe@ibj.io>
|
|
|
|
Date: Thu, 3 Mar 2016 02:48:12 -0600
|
|
|
|
Subject: [PATCH] Add velocity warnings
|
|
|
|
|
|
|
|
|
2017-01-08 22:43:08 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2017-05-23 22:11:28 +00:00
|
|
|
index 1381d234e..00208ff45 100644
|
2017-01-08 22:43:08 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2017-05-23 22:11:28 +00:00
|
|
|
@@ -174,6 +174,7 @@ public final class CraftServer implements Server {
|
2017-01-08 22:43:08 +00:00
|
|
|
private final UUID invalidUserUUID = UUID.nameUUIDFromBytes("InvalidUsername".getBytes(Charsets.UTF_8));
|
|
|
|
private final List<CraftPlayer> playerView;
|
|
|
|
public int reloadCount;
|
|
|
|
+ public static Exception excessiveVelEx; // Paper - Velocity warnings
|
|
|
|
|
|
|
|
private final class BooleanWrapper {
|
|
|
|
private boolean value = true;
|
2016-02-29 23:09:49 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2017-05-28 05:06:26 +00:00
|
|
|
index 87813d59c..0a05da58f 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2017-05-28 05:06:26 +00:00
|
|
|
@@ -237,12 +237,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public void setVelocity(Vector vel) {
|
|
|
|
+ // Paper start - Warn server owners when plugins try to set super high velocities
|
2017-05-28 05:06:26 +00:00
|
|
|
+ if (!(this instanceof org.bukkit.entity.Projectile) && isUnsafeVelocity(vel)) {
|
|
|
|
+ CraftServer.excessiveVelEx = new Exception("Excessive velocity set detected: tried to set velocity of entity " + entity.getName() + " id #" + getEntityId() + " to (" + vel.getX() + "," + vel.getY() + "," + vel.getZ() + ").");
|
2016-02-29 23:09:49 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
entity.motX = vel.getX();
|
|
|
|
entity.motY = vel.getY();
|
|
|
|
entity.motZ = vel.getZ();
|
2017-05-28 05:06:26 +00:00
|
|
|
entity.velocityChanged = 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;
|
|
|
|
+ } else if (x != x || y != y || z != z) { // NaN check
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public double getHeight() {
|
|
|
|
return getHandle().length;
|
2017-01-08 22:43:08 +00:00
|
|
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
2017-03-25 05:22:02 +00:00
|
|
|
index 3ed983cc0..6384d50e7 100644
|
2017-01-08 22:43:08 +00:00
|
|
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
|
|
|
@@ -66,7 +66,19 @@ public class WatchdogThread extends Thread
|
|
|
|
log.log( Level.SEVERE, "During the run of the server, a physics stackoverflow was supressed" );
|
|
|
|
log.log( Level.SEVERE, "near " + net.minecraft.server.World.blockLocation);
|
|
|
|
}
|
|
|
|
- //
|
|
|
|
+ // 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!):" );
|
|
|
|
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
|
2016-02-29 23:09:49 +00:00
|
|
|
--
|
2017-05-23 22:11:28 +00:00
|
|
|
2.13.0.windows.1
|
2016-02-29 23:09:49 +00:00
|
|
|
|