Upstream merge.

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

View File

@@ -1,14 +1,14 @@
From 24f1df5c2d5baa4d5a293d26b7b5b7dfeebe594b Mon Sep 17 00:00:00 2001
From d0d33c2a76ff2f3296819e8285c903de0c5f3904 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 25 Jun 2013 18:09:26 +1000
Subject: [PATCH] Always Fire PreLoginEvent
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index e634575..c9dda32 100644
index 9deb9d1..a5c3104 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -111,7 +111,7 @@ public class PendingConnection extends Connection {
@@ -114,7 +114,7 @@ public class PendingConnection extends Connection {
}
this.j = true;