Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-01-15 20:28:26 +11:00
parent e4f2987e65
commit 1180c5cc83
15 changed files with 47 additions and 47 deletions

View File

@@ -1,4 +1,4 @@
From 10a0e39c13eff0e451cd4d144037078a6851c783 Mon Sep 17 00:00:00 2001
From eb8c380d237d918ed3cf4315a6b3246ac353521c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@@ -45,10 +45,10 @@ index 1725bba..5174602 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4d77259..5cd6f7d 100644
index 4f03183..0ac8f52 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -547,11 +547,7 @@ public final class CraftServer implements Server {
@@ -549,11 +549,7 @@ public final class CraftServer implements Server {
return true;
}