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

Upstream merge.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-08 08:36:30 +10:00
parent e7e8fa87a5
commit aecf382223
25 changed files with 69 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0047-Allow-Disabling-of-Command-Logging.patch
View File

@@ -1,14 +1,14 @@
From ee7d8beccd4867f700f5b368775aca6f429556b2 Mon Sep 17 00:00:00 2001
From 03a26bff7fe3efbb77258b3aa092bfc079ac1108 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 5d669d0..4dc5688 100644
index f894e24..27776e4 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -970,7 +970,12 @@ public class PlayerConnection extends Connection {
@@ -962,7 +962,12 @@ public class PlayerConnection extends Connection {
}
try {
@@ -23,7 +23,7 @@ index 5d669d0..4dc5688 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 1ec9272..d64eb0b 100644
index 710d12c..a1fb71f 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -234,4 +234,10 @@ public class SpigotConfig