mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-06 20:08:13 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fc
SPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2
Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7
Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From fce0f6f5b837d223e55e3a0fd3a4420fc8a4d146 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 a0909736..6c09ea6c 100644
|
|
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
|
|
@@ -3,6 +3,8 @@ 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;
|
|
@@ -26,7 +28,32 @@ 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 = "";
|
|
this.name = name;
|
|
--
|
|
2.21.0
|
|
|