SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-18 17:08:19 +00:00
parent 1f1443ed34
commit 804a818172
17 changed files with 84 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0116-Descriptive-kick-reasons-instead-of-Nope.patch
View File

@@ -1,14 +1,14 @@
From 8f15821f59865e394ecd6e3c03c8df483918bf68 Mon Sep 17 00:00:00 2001
From e6d30fec201e289154842583df812bffb9b10af0 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 c049cd8..37a9cae 100644
index c542460..961927b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -218,7 +218,7 @@ public abstract class Entity {
@@ -220,7 +220,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");
@@ -17,7 +17,7 @@ index c049cd8..37a9cae 100644
}
f = 0;
}
@@ -231,7 +231,7 @@ public abstract class Entity {
@@ -233,7 +233,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");
@@ -27,7 +27,7 @@ index c049cd8..37a9cae 100644
f1 = 0;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 55db414..6f30e6d 100644
index f645690..170ab7e 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -184,7 +184,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -49,5 +49,5 @@ index 55db414..6f30e6d 100644
}
--
1.8.3.2
1.9.1