From ddf5477f5788bfda1ce50591037a92d35f39c329 Mon Sep 17 00:00:00 2001 From: drXor Date: Sat, 15 Mar 2014 01:32:18 -0400 Subject: [PATCH] Change various "Nope!" kick messages to something more descriptive and less confusing for players. --- ...riptive-kick-reasons-instead-of-Nope.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 CraftBukkit-Patches/0119-Descriptive-kick-reasons-instead-of-Nope.patch diff --git a/CraftBukkit-Patches/0119-Descriptive-kick-reasons-instead-of-Nope.patch b/CraftBukkit-Patches/0119-Descriptive-kick-reasons-instead-of-Nope.patch new file mode 100644 index 0000000000..fe86a84960 --- /dev/null +++ b/CraftBukkit-Patches/0119-Descriptive-kick-reasons-instead-of-Nope.patch @@ -0,0 +1,53 @@ +From 03bfe7469ed1b2d35847d1c3dc2bf5a9720eb2be Mon Sep 17 00:00:00 2001 +From: drXor +Date: Sat, 15 Mar 2014 01:30:05 -0400 +Subject: [PATCH] Descriptive kick reasons instead of Nope! + + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 4d09fdb..2bacea0 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -217,7 +217,7 @@ public abstract class Entity { + if ((f == Float.POSITIVE_INFINITY) || (f == Float.NEGATIVE_INFINITY)) { + if (this instanceof EntityPlayer) { + this.world.getServer().getLogger().warning(((CraftPlayer) this.getBukkitEntity()).getName() + " was caught trying to crash the server with an invalid yaw"); +- ((CraftPlayer) this.getBukkitEntity()).kickPlayer("Nope"); ++ ((CraftPlayer) this.getBukkitEntity()).kickPlayer("Infinite yaw (Hacking?)"); //Spigot "Nope" -> Descriptive reason + } + f = 0; + } +@@ -230,7 +230,7 @@ public abstract class Entity { + if ((f1 == Float.POSITIVE_INFINITY) || (f1 == Float.NEGATIVE_INFINITY)) { + if (this instanceof EntityPlayer) { + this.world.getServer().getLogger().warning(((CraftPlayer) this.getBukkitEntity()).getName() + " was caught trying to crash the server with an invalid pitch"); +- ((CraftPlayer) this.getBukkitEntity()).kickPlayer("Nope"); ++ ((CraftPlayer) this.getBukkitEntity()).kickPlayer("Infinite pitch (Hacking?)"); //Spigot "Nope" -> Descriptive reason + } + f1 = 0; + } +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index b68cd97..f6bcccb 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -183,7 +183,7 @@ public class PlayerConnection implements PacketPlayInListener { + // CraftBukkit start - Check for NaN + if (Double.isNaN(packetplayinflying.x) || Double.isNaN(packetplayinflying.y) || Double.isNaN(packetplayinflying.z) || Double.isNaN(packetplayinflying.stance)) { + c.warn(player.getName() + " was caught trying to crash the server with an invalid position."); +- getPlayer().kickPlayer("Nope!"); ++ getPlayer().kickPlayer("NaN in position (Hacking?)"); //Spigot "Nope" -> Descriptive reason + return; + } + // CraftBukkit end +@@ -777,7 +777,7 @@ public class PlayerConnection implements PacketPlayInListener { + this.player.w(); + } else { + c.warn(this.player.getName() + " tried to set an invalid carried item"); +- this.disconnect("Nope!"); // CraftBukkit ++ this.disconnect("Invalid hotbar selection (Hacking?)"); // CraftBukkit //Spigot "Nope" -> Descriptive reason + } + } + +-- +1.8.4.2 +