Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-09 18:00:58 +11:00
parent 987080283a
commit a6e7c7a91e
46 changed files with 106 additions and 401 deletions

View File

@@ -1,14 +1,14 @@
From 3a11fb5f840dedcf08ea38c90debb9db7f737ad8 Mon Sep 17 00:00:00 2001
From 3e7fbdf04a48f981b99a6acdbce907b2da2fead0 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 cf5fb7e..8e80ab5 100644
index c4ed619..67c8bba 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -923,7 +923,12 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -928,7 +928,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
try {