Paper/Bukkit-Patches/0006-BungeeCord-Support.patch

104 lines
3.8 KiB
Diff
Raw Normal View History

2013-12-22 00:06:06 +01:00
From aed8c09032e9555f06ad01efe79a72e44c0bb3e6 Mon Sep 17 00:00:00 2001
2013-05-14 13:14:43 +02:00
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
2013-05-14 13:14:43 +02:00
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
2013-12-18 07:48:18 +01:00
index 7aa697d..22bce07 100644
2013-05-14 13:14:43 +02:00
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2013-12-18 07:48:18 +01:00
@@ -788,4 +788,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
2013-07-24 11:29:30 +02:00
* @see Player#setHealthScaled(boolean)
2013-05-14 13:14:43 +02:00
*/
2013-07-24 11:29:30 +02:00
public double getHealthScale();
2013-05-14 13:14:43 +02:00
+
+ // Spigot start
2013-08-03 11:54:36 +02:00
+ public class Spigot extends Entity.Spigot
+ {
+
+ /**
+ * Gets the connection address of this player, regardless of whether it
+ * has been spoofed or not.
+ *
+ * @return the player's connection address
+ */
+ public InetSocketAddress getRawAddress()
+ {
+ throw new UnsupportedOperationException( "Not supported yet." );
+ }
+ }
+
+ Spigot spigot();
2013-05-14 13:14:43 +02:00
+ // Spigot end
}
2013-05-21 12:45:44 +02:00
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
2013-12-18 07:48:18 +01:00
index b74b7b8..8fb1c98 100644
2013-05-21 12:45:44 +02:00
--- 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 {
private final String hostname;
private Result result = Result.ALLOWED;
private String message = "";
+ private final InetAddress realAddress; // Spigot
/**
* @deprecated Address should be provided in other constructor
2013-12-18 07:48:18 +01:00
@@ -40,10 +41,17 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param address The address the player used to connect, provided for
* timing issues
2013-05-21 12:45:44 +02:00
*/
- public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address) {
+ public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address, final InetAddress realAddress) { // Spigot
super(player);
this.hostname = hostname;
this.address = address;
+ // Spigot start
+ this.realAddress = address;
+ }
+
+ public PlayerLoginEvent(final Player player, final String hostname, final InetAddress address) {
+ this(player, hostname, address, address);
+ // Spigot end
}
/**
2013-12-18 07:48:18 +01:00
@@ -52,7 +60,7 @@ public class PlayerLoginEvent extends PlayerEvent {
2013-05-21 12:45:44 +02:00
*/
@Deprecated
public PlayerLoginEvent(final Player player, final Result result, final String message) {
- this(player, "", null, result, message);
+ this(player, "", null, result, message, null); // Spigot
}
/**
2013-12-18 07:48:18 +01:00
@@ -65,12 +73,23 @@ public class PlayerLoginEvent extends PlayerEvent {
2013-05-21 12:45:44 +02:00
* @param result The result status for this event
* @param message The message to be displayed if result denies login
*/
- public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message) {
- this(player, hostname, address);
+ public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
+ this(player, hostname, address, realAddress); // Spigot
this.result = result;
this.message = message;
}
+ // Spigot start
+ /**
+ * Gets the connection address of this player, regardless of whether it has been spoofed or not.
+ *
+ * @return the player's connection address
+ */
+ public InetAddress getRealAddress() {
+ return realAddress;
+ }
+ // Spigot end
+
/**
* Gets the current result of the login, as an enum
*
2013-05-14 13:14:43 +02:00
--
2013-12-18 07:48:18 +01:00
1.8.3.2