Upstream merge

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
Spigot
2014-05-14 14:02:09 +01:00
parent d54d6ad87d
commit 51faa817d1
11 changed files with 36 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
From c036ffdf17e499b702947010eaeaeaa0e1b8f2f9 Mon Sep 17 00:00:00 2001
From e35855cf232e8ca71cad50484959b98e247ae142 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 2a15271..e156a5a 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 53be9ae..e209ef4 100644
index 7b68460..73d92fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -708,11 +708,7 @@ public final class CraftServer implements Server {
@@ -706,11 +706,7 @@ public final class CraftServer implements Server {
return true;
}