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

Upstream merge

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-18 17:48:18 +11:00
parent be8c216be7
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Bukkit-Patches/0006-BungeeCord-Support.patch
View File

@@ -1,14 +1,14 @@
From 90e7f1b07d3998ff3eabc59edb00fe2993b02eb8 Mon Sep 17 00:00:00 2001
From 912392969b3e727b360b37836a85b2456ad7c991 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3ec374b..cc9c3b2 100644
index 7aa697d..22bce07 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -721,4 +721,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -788,4 +788,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @see Player#setHealthScaled(boolean)
*/
public double getHealthScale();
@@ -33,7 +33,7 @@ index 3ec374b..cc9c3b2 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 60c0875..dab3c5c 100644
index b74b7b8..8fb1c98 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 {
@@ -44,9 +44,9 @@ index 60c0875..dab3c5c 100644
/**
* @deprecated Address should be provided in other constructor
@@ -38,10 +39,17 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param hostname The hostname that was used to connect to the server
* @param address The address the player used to connect, provided for timing issues
@@ -40,10 +41,17 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param address The address the player used to connect, provided for
* timing issues
*/
- 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
@@ -63,7 +63,7 @@ index 60c0875..dab3c5c 100644
}
/**
@@ -49,7 +57,7 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -52,7 +60,7 @@ public class PlayerLoginEvent extends PlayerEvent {
*/
@Deprecated
public PlayerLoginEvent(final Player player, final Result result, final String message) {
@@ -72,7 +72,7 @@ index 60c0875..dab3c5c 100644
}
/**
@@ -61,12 +69,23 @@ public class PlayerLoginEvent extends PlayerEvent {
@@ -65,12 +73,23 @@ public class PlayerLoginEvent extends PlayerEvent {
* @param result The result status for this event
* @param message The message to be displayed if result denies login
*/
@@ -99,5 +99,5 @@ index 60c0875..dab3c5c 100644
* Gets the current result of the login, as an enum
*
--
1.8.1.2
1.8.3.2