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

Upstream merge + remove 3 pulled patches.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-12 10:17:46 +10:00
parent 70387ed9d8
commit 754e2b5680
28 changed files with 42 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From e87093815494e4ca3a4c9d1f7f85bc918a60b278 Mon Sep 17 00:00:00 2001
From bd3a9ccfa048c4e5f99c2add256cdca7789a5a07 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
@@ -21,10 +21,10 @@ index 5e9dad2..9deb9d1 100644
} else {
this.loginKey = this.server.getOnlineMode() ? Long.toString(random.nextLong(), 16) : "-";
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 38e0c5b..262682d 100644
index a85157b..e5a259d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -309,7 +309,7 @@ public abstract class PlayerList {
@@ -310,7 +310,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
} else if (!this.isWhitelisted(s)) {
@@ -33,7 +33,7 @@ index 38e0c5b..262682d 100644
} else {
String s2 = socketaddress.toString();
@@ -325,7 +325,7 @@ public abstract class PlayerList {
@@ -326,7 +326,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s3);
} else if (this.players.size() >= this.maxPlayers) {