mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-26 22:50:23 +02:00
Update Bungee support to new patch. This is breaking.
This commit is contained in:
parent
20f62305d1
commit
fc6cfcb21a
|
@ -1,25 +1,35 @@
|
||||||
From 023a20f822b88403e7f6adae71f7386c70735176 Mon Sep 17 00:00:00 2001
|
From ac46455a052a50c147304066f571414039f9a37a Mon Sep 17 00:00:00 2001
|
||||||
From: md_5 <md_5@live.com.au>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Tue, 14 May 2013 21:11:29 +1000
|
Date: Sun, 2 Jun 2013 15:20:49 +1000
|
||||||
Subject: [PATCH] BungeeCord Support
|
Subject: [PATCH] BungeeCord Support
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index de42f2e..6493825 100644
|
index de42f2e..0c46c84 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -646,4 +646,13 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
@@ -646,4 +646,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
* yet or has logged out
|
* yet or has logged out
|
||||||
*/
|
*/
|
||||||
public void setScoreboard(Scoreboard scoreboard) throws IllegalArgumentException, IllegalStateException;
|
public void setScoreboard(Scoreboard scoreboard) throws IllegalArgumentException, IllegalStateException;
|
||||||
+
|
+
|
||||||
+ // Spigot start
|
+ // Spigot start
|
||||||
+ /**
|
+ public class Spigot
|
||||||
+ * Gets the connection address of this player, regardless of whether it has been spoofed or not.
|
+ {
|
||||||
+ *
|
+
|
||||||
+ * @return the player's connection address
|
+ /**
|
||||||
+ */
|
+ * Gets the connection address of this player, regardless of whether it
|
||||||
+ public InetSocketAddress getRawAddress();
|
+ * has been spoofed or not.
|
||||||
|
+ *
|
||||||
|
+ * @return the player's connection address
|
||||||
|
+ */
|
||||||
|
+ public InetSocketAddress getRawAddress()
|
||||||
|
+ {
|
||||||
|
+ throw new UnsupportedOperationException( "Not supported yet." );
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ Spigot spigot();
|
||||||
+ // Spigot end
|
+ // Spigot end
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||||
|
@ -89,5 +99,5 @@ index 60c0875..dab3c5c 100644
|
||||||
* Gets the current result of the login, as an enum
|
* Gets the current result of the login, as an enum
|
||||||
*
|
*
|
||||||
--
|
--
|
||||||
1.8.2.1
|
1.8.1.2
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From ff2fcf3f4c863531cbb4f86ce3b8ea4f7a8ed243 Mon Sep 17 00:00:00 2001
|
From 422434f8916ce03d16987970843cd154bb4a7676 Mon Sep 17 00:00:00 2001
|
||||||
From: md_5 <md_5@live.com.au>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Sun, 2 Jun 2013 15:10:56 +1000
|
Date: Sun, 2 Jun 2013 15:10:56 +1000
|
||||||
Subject: [PATCH] Skeleton API Implementations
|
Subject: [PATCH] Skeleton API Implementations
|
||||||
|
@ -21,6 +21,26 @@ index b46b9c4..c91b12c 100644
|
||||||
+ {
|
+ {
|
||||||
+ return spigot;
|
+ return spigot;
|
||||||
+ }
|
+ }
|
||||||
|
+ // Spigot end
|
||||||
|
}
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
index 8c30bf5..df07a9b 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
|
@@ -993,4 +993,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
|
|
||||||
|
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Spigot start
|
||||||
|
+ private final Spigot spigot = new Spigot()
|
||||||
|
+ {
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ public Spigot spigot()
|
||||||
|
+ {
|
||||||
|
+ return spigot;
|
||||||
|
+ }
|
||||||
+ // Spigot end
|
+ // Spigot end
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
|
|
|
@ -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>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Sat, 23 Mar 2013 11:15:11 +1100
|
Date: Sat, 23 Mar 2013 11:15:11 +1100
|
||||||
Subject: [PATCH] BungeeCord Support
|
Subject: [PATCH] BungeeCord Support
|
||||||
|
@ -79,20 +79,21 @@ index 2422d29..861cfd9 100644
|
||||||
if (metrics == null) {
|
if (metrics == null) {
|
||||||
try {
|
try {
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
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
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||||
+++ b/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);
|
public Spigot spigot()
|
||||||
}
|
|
||||||
+
|
|
||||||
+ // Spigot start
|
|
||||||
+ public InetSocketAddress getRawAddress() {
|
|
||||||
+ return (getHandle().playerConnection == null) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
|
|
||||||
+ }
|
|
||||||
+ // Spigot end
|
|
||||||
}
|
|
||||||
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
|
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
|
||||||
index 71374d7..f0d9129 100644
|
index 71374d7..f0d9129 100644
|
||||||
--- a/src/main/resources/configurations/bukkit.yml
|
--- a/src/main/resources/configurations/bukkit.yml
|
||||||
|
|
Loading…
Reference in New Issue
Block a user