Upstream merge, nothing major.

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-21 19:13:39 +11:00
parent c14cb5a15b
commit 2c6428f4b1
13 changed files with 39 additions and 324 deletions

View File

@@ -1,14 +1,14 @@
From 89d72a512578e8c152d804e8b39c55436ea48d57 Mon Sep 17 00:00:00 2001
From 8cfeba1ddf246c3db3ed85cb7c2115c6c1417c02 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d34fea7..df988f1 100644
index d0ea17a..31be464 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -927,7 +927,12 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -930,7 +930,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
try {