geforkt von Mirrors/Paper
c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
62 Zeilen
2.6 KiB
Diff
62 Zeilen
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() {
|