mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-27 14:12:45 +02:00
2f92d4e00e
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: 01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs bc145b90 PR-940: Create registry for banner pattern and cat type CraftBukkit Changes: cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways 4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs b483a20db PR-1303: Create registry for banner pattern and cat type 4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
62 lines
2.6 KiB
Diff
62 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MCMDEV <john-m.1@gmx.de>
|
|
Date: Fri, 24 Sep 2021 17:59:23 +0200
|
|
Subject: [PATCH] Added getHostname 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 34e4d666b6af58f64c6c001df80fadf818847e6a..fc2d9e85b65347b90bde3b0b13ccae759e33d466 100644
|
|
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
@@ -22,6 +22,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
private final InetAddress ipAddress;
|
|
private final InetAddress rawAddress; // Paper
|
|
//private UUID uniqueId; // Paper - Not used anymore
|
|
+ private final String hostname; // Paper
|
|
|
|
@Deprecated
|
|
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
|
|
@@ -67,7 +68,14 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
this(name, ipAddress, ipAddress, uniqueId, profile);
|
|
}
|
|
|
|
+ @Deprecated // Paper - Add hostname
|
|
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
|
|
+ // Paper start - Add hostname
|
|
+ this(name, ipAddress, rawAddress, uniqueId, profile, "");
|
|
+ }
|
|
+
|
|
+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final InetAddress rawAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile, @NotNull String hostname) {
|
|
+ // Paper end - Add hostname
|
|
super(true);
|
|
this.profile = profile;
|
|
// Paper end
|
|
@@ -77,6 +85,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
this.ipAddress = ipAddress;
|
|
this.rawAddress = rawAddress; // Paper
|
|
//this.uniqueId = uniqueId; // Paper - Not used anymore
|
|
+ this.hostname = hostname; // Paper - Add hostname
|
|
}
|
|
|
|
/**
|
|
@@ -262,6 +271,19 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
return profile.getId(); // Paper
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the hostname that the player used to connect to the server, or
|
|
+ * blank if unknown
|
|
+ *
|
|
+ * @return The hostname
|
|
+ */
|
|
+ @NotNull
|
|
+ public String getHostname() {
|
|
+ return hostname;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
@Override
|
|
public HandlerList getHandlers() {
|