Merge in some stuff

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-14 17:58:22 +11:00
parent 098db09224
commit 5cd48cf621
14 changed files with 54 additions and 54 deletions

View File

@@ -1,14 +1,14 @@
From d7a201d255ff143edf20b3ae9d1f901fadd79b71 Mon Sep 17 00:00:00 2001
From 89d72a512578e8c152d804e8b39c55436ea48d57 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 c4ed619..67c8bba 100644
index d34fea7..df988f1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -928,7 +928,12 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -927,7 +927,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
try {
@@ -23,7 +23,7 @@ index c4ed619..67c8bba 100644
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
return;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 31e708c..895af4b 100644
index 0043690..26d5845 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -136,4 +136,10 @@ public class SpigotConfig