Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-21 13:39:32 +10:00
parent b9b50f31e2
commit 592cae8e3e
6 changed files with 18 additions and 17 deletions

View File

@@ -1,14 +1,14 @@
From d964dd9ec685eddd8bda68260b57ef12d2c2b1be Mon Sep 17 00:00:00 2001
From edf843cfae42c688f7003f0aeb4aacd081d0ac0a 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 a30717a..b098745 100644
index 2b1df38..358cba4 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -112,7 +112,7 @@ public class PendingConnection extends Connection {
@@ -113,7 +113,7 @@ public class PendingConnection extends Connection {
}
this.j = true;