SteamWar/Paper
10
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-12-02 07:36:51 +11:00
parent 0656fd7a23
commit 9a876418c1
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0040-Configurable-Messages.patch
View File

@@ -1,4 +1,4 @@
From d54f156ceae783962b48ffd878aa9a7634fcd00d Mon Sep 17 00:00:00 2001
From 0d0356e87624e867a525ca00fa12f45f09fe41d1 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
@@ -23,7 +23,7 @@ index b7f6775..b96e2ef 100644
this.b.a((IChatBaseComponent) chatcomponenttext);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 196ac4f..b10b9a7 100644
index f3294b0..81dbf37 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -335,7 +335,7 @@ public abstract class PlayerList {
@@ -45,10 +45,10 @@ index 196ac4f..b10b9a7 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5178808..82a566d 100644
index abe05dc..be43d4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -548,11 +548,7 @@ public final class CraftServer implements Server {
@@ -547,11 +547,7 @@ public final class CraftServer implements Server {
return true;
}