mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 02:42:14 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From e37945a5eefd4246c9fc42b42daf2e9ce81d7f13 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 c8384da69..6c09ea6c6 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;
|
|
@@ -25,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
|
|
|