geforkt von Mirrors/Paper
96d5e6ca48
Currently includes generated key holder classes for types used in the Registry Modification API
92 Zeilen
3.3 KiB
Diff
92 Zeilen
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 18 Mar 2018 11:43:30 -0400
|
|
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
|
|
|
|
This will allow you to change the players name or skin on login.
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
index c7c45e2de8cca1bf8b8e12752e08db62403efa6a..c30b44ff26f8f253902754452a0816f07c7fd035 100644
|
|
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
@@ -2,6 +2,9 @@ package org.bukkit.event.player;
|
|
|
|
import java.net.InetAddress;
|
|
import java.util.UUID;
|
|
+
|
|
+import com.destroystokyo.paper.profile.PlayerProfile;
|
|
+import org.bukkit.Bukkit;
|
|
import org.bukkit.event.Event;
|
|
import org.bukkit.event.HandlerList;
|
|
import org.jetbrains.annotations.NotNull;
|
|
@@ -15,9 +18,9 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
private static final HandlerList handlers = new HandlerList();
|
|
private Result result;
|
|
private net.kyori.adventure.text.Component message; // Paper
|
|
- private final String name;
|
|
+ //private String name; // Paper - Not used anymore
|
|
private final InetAddress ipAddress;
|
|
- private final UUID uniqueId;
|
|
+ //private UUID uniqueId; // Paper - Not used anymore
|
|
|
|
@Deprecated
|
|
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
|
|
@@ -25,12 +28,37 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
}
|
|
|
|
public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
|
|
+ // Paper start
|
|
+ this(name, ipAddress, uniqueId, Bukkit.createProfile(uniqueId, name));
|
|
+ }
|
|
+ private PlayerProfile profile;
|
|
+
|
|
+ /**
|
|
+ * Gets the PlayerProfile of the player logging in
|
|
+ * @return The Profile
|
|
+ */
|
|
+ @NotNull
|
|
+ public PlayerProfile getPlayerProfile() {
|
|
+ return profile;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Changes the PlayerProfile the player will login as
|
|
+ * @param profile The profile to use
|
|
+ */
|
|
+ public void setPlayerProfile(@NotNull PlayerProfile profile) {
|
|
+ this.profile = profile;
|
|
+ }
|
|
+
|
|
+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, @NotNull PlayerProfile profile) {
|
|
super(true);
|
|
+ this.profile = profile;
|
|
+ // Paper end
|
|
this.result = Result.ALLOWED;
|
|
this.message = net.kyori.adventure.text.Component.empty(); // Paper
|
|
- this.name = name;
|
|
+ //this.name = name; // Paper - Not used anymore
|
|
this.ipAddress = ipAddress;
|
|
- this.uniqueId = uniqueId;
|
|
+ //this.uniqueId = uniqueId; // Paper - Not used anymore
|
|
}
|
|
|
|
/**
|
|
@@ -193,7 +221,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
*/
|
|
@NotNull
|
|
public String getName() {
|
|
- return name;
|
|
+ return profile.getName(); // Paper
|
|
}
|
|
|
|
/**
|
|
@@ -213,7 +241,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
|
|
*/
|
|
@NotNull
|
|
public UUID getUniqueId() {
|
|
- return uniqueId;
|
|
+ return profile.getId(); // Paper
|
|
}
|
|
|
|
@NotNull
|