Upstream Merge

By: md_5 <md_5@live.com.au>
2013-10-24 21:23:24 +11:00
parent dbe0e9acde
commit 9658a61088
19 changed files with 90 additions and 88 deletions
--- a/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch
+++ b/CraftBukkit-Patches/0046-Allow-Disabling-of-Command-Logging.patch
@@ -1,14 +1,14 @@
-From 912bce0a32246db9bbe1624ed6f69d9188d9fd4e Mon Sep 17 00:00:00 2001
+From c94b0568262d0bf5f9fb4817903fb1e908d370e0 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 fd6995d..3c03d5a 100644
+index 759dc89..c867fcf 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -967,7 +967,12 @@ public class PlayerConnection extends Connection {
+@@ -976,7 +976,12 @@ public class PlayerConnection extends Connection {
         }
 
         try {
@@ -38,5 +38,5 @@ index 86e3680..babedc0 100644
 +    }
 }
 -- 
-1.8.1.2
+1.8.3.2