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

Update to CraftBukkit 1.6.4

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-20 11:46:45 +10:00
parent 759d56f0fb
commit d0f0d605bf
26 changed files with 129 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0029-BungeeCord-Support.patch
View File

@@ -1,4 +1,4 @@
From ba5620ccf386fd94ddce7fe2158550ece485f03a Mon Sep 17 00:00:00 2001
From a00b57c3f0b5e97e36616d767febdcb7011a064f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 11:15:11 +1100
Subject: [PATCH] BungeeCord Support
@@ -6,10 +6,10 @@ Subject: [PATCH] BungeeCord Support
- Allows BungeeCord to set the players real IP address very early in the login process, so that the BungeeCord proxy IP is never even seen by a plugin.
diff --git a/src/main/java/net/minecraft/server/PendingConnection.java b/src/main/java/net/minecraft/server/PendingConnection.java
index 7f2c1a9..5593b62 100644
index f48d4a9..9080831 100644
--- a/src/main/java/net/minecraft/server/PendingConnection.java
+++ b/src/main/java/net/minecraft/server/PendingConnection.java
@@ -237,4 +237,17 @@ public class PendingConnection extends Connection {
@@ -235,4 +235,17 @@ public class PendingConnection extends Connection {
static boolean a(PendingConnection pendingconnection, boolean flag) {
return pendingconnection.h = flag;
}
@@ -59,7 +59,7 @@ index f87ebf9..f5032be 100644
event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 988c6e7..aa49c6c 100644
index 20be022..e242f7d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1077,6 +1077,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {