testserver/CraftBukkit-Patches/0095-Descriptive-kick-reaso...

54 lines
3.0 KiB
Diff
Raw Normal View History

2015-02-28 11:36:22 +00:00
From 5366ec74774f139c46dc97f76cedabcf60753a10 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
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
2015-02-28 11:36:22 +00:00
index 82accf4..d6bef0b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2015-02-28 11:36:22 +00:00
@@ -209,7 +209,7 @@ public abstract class Entity implements ICommandListener {
2014-11-28 01:17:45 +00:00
if (f == Float.POSITIVE_INFINITY || f == Float.NEGATIVE_INFINITY) {
if (this instanceof EntityPlayer) {
2014-11-28 01:17:45 +00:00
this.world.getServer().getLogger().warning(this.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;
}
2015-02-28 11:36:22 +00:00
@@ -222,7 +222,7 @@ public abstract class Entity implements ICommandListener {
2014-11-28 01:17:45 +00:00
if (f1 == Float.POSITIVE_INFINITY || f1 == Float.NEGATIVE_INFINITY) {
if (this instanceof EntityPlayer) {
2014-11-28 01:17:45 +00:00
this.world.getServer().getLogger().warning(this.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
2015-02-28 11:36:22 +00:00
index b650419..0bcdef4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2015-02-28 11:36:22 +00:00
@@ -196,7 +196,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
// CraftBukkit start - Check for NaN
2015-02-26 10:40:16 +00:00
if (!NumberConversions.isFinite(packetplayinflying.x) || !NumberConversions.isFinite(packetplayinflying.y) || !NumberConversions.isFinite(packetplayinflying.z)) {
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
2015-02-28 11:36:22 +00:00
@@ -892,7 +892,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
2014-11-28 01:17:45 +00:00
this.player.z();
} else {
2014-11-28 01:17:45 +00:00
PlayerConnection.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
}
}
--
2014-11-28 01:17:45 +00:00
2.1.0