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

Update Bungee support to new patch. This is breaking.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-06-02 15:22:22 +10:00
parent a614b7af96
commit ba4eb1ba79
3 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CraftBukkit-Patches/0032-BungeeCord-Support.patch
View File

@@ -1,4 +1,4 @@
From 6b2a6b0338058abbe9221578bbb97b8415d409da Mon Sep 17 00:00:00 2001
From 4580c29449670fe30f2b72e87160ef0f630dbdc8 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
@@ -79,20 +79,21 @@ index 2422d29..861cfd9 100644
if (metrics == null) {
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0b5ea21..26cb661 100644
index 8ec84e1..d70c110 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1012,4 +1012,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1016,6 +1016,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Spigot spigot = new Spigot()
{
+ @Override
+ public InetSocketAddress getRawAddress()
+ {
+ return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
+ }
};
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
}
+
+ // Spigot start
+ public InetSocketAddress getRawAddress() {
+ return (getHandle().playerConnection == null) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
+ }
+ // Spigot end
}
public Spigot spigot()
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 71374d7..f0d9129 100644
--- a/src/main/resources/configurations/bukkit.yml