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-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/0049-Configurable-Messages.patch
View File

@@ -1,14 +1,14 @@
From a57de3891055b3e336f9439fe3f7cb84341c0560 Mon Sep 17 00:00:00 2001
From e87093815494e4ca3a4c9d1f7f85bc918a60b278 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
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index e634575..41f963d 100644
index 5e9dad2..9deb9d1 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -79,9 +79,9 @@ public class PendingConnection extends Connection {
@@ -82,9 +82,9 @@ public class PendingConnection extends Connection {
if (packet2handshake.d() != 74) {
if (packet2handshake.d() > 74) {
@@ -43,7 +43,7 @@ index 38e0c5b..262682d 100644
event.disallow(PlayerLoginEvent.Result.ALLOWED, s2);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 267605b..100396f 100644
index 0fa69ea..404a626 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -528,11 +528,7 @@ public final class CraftServer implements Server {