mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-09 13:28:36 +02:00
5730a94208
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 2b4582fb SPIGOT-5916: getLastColors does not work with the rgb colors CraftBukkit Changes: f7707086d SPIGOT-7299: Fix indirect/anvil damage events and minor improvements
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Connor Linfoot <connorlinfoot@me.com>
|
|
Date: Wed, 12 May 2021 08:09:19 +0100
|
|
Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
index 9acf1fb404ccf9b3bc06a448c3099ca2e838facf..baee5038ec7c3e190a328016d9ab290ae48badf6 100644
|
|
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
@@ -20,6 +20,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
private net.kyori.adventure.text.Component message; // Paper
|
|
//private String name; // Paper - Not used anymore
|
|
private final InetAddress ipAddress;
|
|
+ private final InetAddress rawAddress; // Paper
|
|
//private UUID uniqueId; // Paper - Not used anymore
|
|
|
|
@Deprecated
|
|
@@ -49,7 +50,23 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
this.profile = profile;
|
|
}
|
|
|
|
+ // Paper Start
|
|
+ /**
|
|
+ * Gets the raw address of the player logging in
|
|
+ * @return The address
|
|
+ */
|
|
+ @NotNull
|
|
+ public InetAddress getRawAddress() {
|
|
+ return rawAddress;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
+ @Deprecated
|
|
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
|
|
+ this(name, ipAddress, ipAddress, uniqueId, profile);
|
|
+ }
|
|
+
|
|
+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
|
|
super(true);
|
|
this.profile = profile;
|
|
// Paper end
|
|
@@ -57,6 +74,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
this.message = net.kyori.adventure.text.Component.empty(); // Paper
|
|
//this.name = name; // Paper - Not used anymore
|
|
this.ipAddress = ipAddress;
|
|
+ this.rawAddress = rawAddress; // Paper
|
|
//this.uniqueId = uniqueId; // Paper - Not used anymore
|
|
}
|
|
|