19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
53 lines
2.9 KiB
Diff
53 lines
2.9 KiB
Diff
From 2e797c33e227a3d16e5b0743c02181c01af8ce8f 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
|
|
index d6c8be8..b0a90d7 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -207,7 +207,7 @@ public abstract class Entity implements ICommandListener {
|
|
if (f == Float.POSITIVE_INFINITY || f == Float.NEGATIVE_INFINITY) {
|
|
if (this instanceof EntityPlayer) {
|
|
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;
|
|
}
|
|
@@ -220,7 +220,7 @@ public abstract class Entity implements ICommandListener {
|
|
if (f1 == Float.POSITIVE_INFINITY || f1 == Float.NEGATIVE_INFINITY) {
|
|
if (this instanceof EntityPlayer) {
|
|
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
|
|
index d7cd546..ef9e2dd 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -185,7 +185,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
|
// CraftBukkit start - Check for NaN
|
|
if (Double.isNaN(packetplayinflying.x) || Double.isNaN(packetplayinflying.y) || Double.isNaN(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
|
|
@@ -841,7 +841,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
|
this.player.z();
|
|
} else {
|
|
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
|
|
}
|
|
}
|
|
|
|
--
|
|
2.1.0
|
|
|