From 0c70e688f77d5068ee1ff11d395186b313382b2b Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 26 Mar 2014 23:53:19 +0000 Subject: [PATCH] Use the right constructor for bungeecord support --- CraftBukkit-Patches/0060-BungeeCord-Support.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CraftBukkit-Patches/0060-BungeeCord-Support.patch b/CraftBukkit-Patches/0060-BungeeCord-Support.patch index b7b0f19ee..c04f783ad 100644 --- a/CraftBukkit-Patches/0060-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0060-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From a2f33e495dfbe8b2a4e97b0909cb56285cc7b75f Mon Sep 17 00:00:00 2001 +From 2498f80d97f1bc9ee50875dc0f9d496c6eb161ce Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 1 Dec 2013 18:18:41 +1100 Subject: [PATCH] BungeeCord Support @@ -84,6 +84,19 @@ index 9ff1694..f6cca80 100644 + } + // Spigot End } +diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java +index 385dc0a..0d6ffef 100644 +--- a/src/main/java/net/minecraft/server/PlayerList.java ++++ b/src/main/java/net/minecraft/server/PlayerList.java +@@ -325,7 +325,7 @@ public abstract class PlayerList { + + EntityPlayer entity = new EntityPlayer(this.server, this.server.getWorldServer(0), gameprofile, new PlayerInteractManager(this.server.getWorldServer(0))); + Player player = entity.getBukkitEntity(); +- PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress()); ++ PlayerLoginEvent event = new PlayerLoginEvent(player, hostname, ((java.net.InetSocketAddress) socketaddress).getAddress(), ((java.net.InetSocketAddress) loginlistener.networkManager.getRawAddress()).getAddress()); + + if (this.banByName.isBanned(gameprofile.getName())) { + BanEntry banentry = (BanEntry) this.banByName.getEntries().get(gameprofile.getName()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 48be84e..8b6e210 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java