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

Upstream merge: conflict resolution and version bump

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-15 17:05:45 +10:00
parent b86bbe69d4
commit 77c0da2f07
12 changed files with 64 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CraftBukkit-Patches/0033-Allow-Disabling-of-Command-Logging.patch
View File

@@ -1,27 +1,22 @@
From 43b719a4545c2790eae1ac8b636f1d1042445fcc Mon Sep 17 00:00:00 2001
From 8123ddb10e530f8f513253a31a957a0c0cc2b545 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 5cde08f..4d7f5ad 100644
index 253a448..c581334 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -953,7 +953,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
@@ -942,7 +942,7 @@ public class PlayerConnection implements PacketPlayInListener {
private void handleCommand(String s) {
org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
// CraftBukkit start - whole method
- this.c.info(this.player.getName() + " issued server command: " + s);
+ if ( org.spigotmc.SpigotConfig.logCommands ) this.c.info(this.player.getName() + " issued server command: " + s); // Spigot
CraftPlayer player = this.getPlayer();
try {
- this.c.info(event.getPlayer().getName() + " issued server command: " + event.getMessage());
+ // Spigot Start
+ if ( org.spigotmc.SpigotConfig.logCommands )
+ {
+ this.c.info(event.getPlayer().getName() + " issued server command: " + event.getMessage());
+ }
+ // Spigot end
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
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 98fcb47..afd6b56 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java