diff --git a/Bukkit-Patches/0006-BungeeCord-Support.patch b/Bukkit-Patches/0006-BungeeCord-Support.patch index 022dd01a55..2beef0af58 100644 --- a/Bukkit-Patches/0006-BungeeCord-Support.patch +++ b/Bukkit-Patches/0006-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 13bf0b8e141d290ef4be6a0b75e8aa82e5d5fd1a Mon Sep 17 00:00:00 2001 +From 7cc271bc52e3e97fecb2d288d925f9b7777e380d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:20:49 +1000 Subject: [PATCH] BungeeCord Support @@ -33,7 +33,7 @@ index 44c9b5a..21f348b 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java -index b74b7b8..8fb1c98 100644 +index b74b7b8..081e994 100644 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java @@ -14,6 +14,7 @@ public class PlayerLoginEvent extends PlayerEvent { @@ -54,7 +54,7 @@ index b74b7b8..8fb1c98 100644 this.hostname = hostname; this.address = address; + // Spigot start -+ this.realAddress = address; ++ this.realAddress = realAddress; + } + + public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address) { @@ -99,5 +99,5 @@ index b74b7b8..8fb1c98 100644 * Gets the current result of the login, as an enum * -- -1.8.3.2 +1.8.5.2.msysgit.0 diff --git a/CraftBukkit-Patches/0124-Fix-several-occurances-of-missed-diff.patch b/CraftBukkit-Patches/0123-Fix-several-occurances-of-missed-diff.patch similarity index 98% rename from CraftBukkit-Patches/0124-Fix-several-occurances-of-missed-diff.patch rename to CraftBukkit-Patches/0123-Fix-several-occurances-of-missed-diff.patch index 2b4f3c478d..c896e6fb33 100644 --- a/CraftBukkit-Patches/0124-Fix-several-occurances-of-missed-diff.patch +++ b/CraftBukkit-Patches/0123-Fix-several-occurances-of-missed-diff.patch @@ -1,4 +1,4 @@ -From 28caafd3fe143b2c512da94e27a03095a45b0127 Mon Sep 17 00:00:00 2001 +From 433062e42e703ec2032fcdef0845b3569c8635a7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 26 Mar 2014 21:21:35 +1100 Subject: [PATCH] Fix several occurances of missed diff. @@ -101,7 +101,7 @@ index b2cde75..b8d08e2 100644 if (!this.checkMovement) { return; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 77b6193..dfa7dae 100644 +index c4698d4..25810d3 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -51,7 +51,7 @@ public abstract class PlayerList { @@ -132,5 +132,5 @@ index e86e21b..418ec40 100644 public boolean b(Achievement achievement) { -- -1.8.3.2 +1.8.5.2.msysgit.0