Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-15 03:41:36 +01:00
Code Issues Projects Releases Wiki Activity

Fix upstream pull

Browse Source
This commit is contained in:
tr7zw 2020-06-23 22:09:40 +02:00
parent 0d925dfcd3
commit 1698a91be5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0031-Add-GameProfileLookupEvent.patch
View File

@ -1,4 +1,4 @@
From c0d3a9e3616702772a7c84f5e74cb76f43edf038 Mon Sep 17 00:00:00 2001
From 105148608ec11fd2604336307c322007246b9640 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 22:22:02 +0100
Subject: [PATCH] Add GameProfileLookupEvent
@ -9,10 +9,10 @@ Subject: [PATCH] Add GameProfileLookupEvent
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
index f98f4d55b..fd7bd1f50 100644
index 676cc44f5..5304cad91 100644
--- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
@@ -5,8 +5,12 @@ import com.google.common.base.Charsets;
@@ -5,9 +5,13 @@ import com.google.common.base.Charsets;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
@ -20,12 +20,13 @@ index f98f4d55b..fd7bd1f50 100644
+import de.tr7zw.yapfa.events.GameProfileLookupEvent;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.UserCache;
import org.apache.commons.lang3.Validate;
+
+import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.spigotmc.SpigotConfig;
@@ -174,11 +178,19 @@ public class CraftPlayerProfile implements PlayerProfile {
@@ -176,11 +180,19 @@ public class CraftPlayerProfile implements PlayerProfile {
boolean isOnlineMode = server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode);
boolean isCompleteFromCache = this.completeFromCache(true);
if (isOnlineMode && (!isCompleteFromCache || textures && !hasTextures())) {
@ -51,7 +52,7 @@ index f98f4d55b..fd7bd1f50 100644
return profile.isComplete() && (!isOnlineMode || !textures || hasTextures());
}
diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
index 509bc01bd..df561910c 100644
index d370dbf84..1d3a380b9 100644
--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
+++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
@@ -4,9 +4,14 @@ import com.google.common.collect.Iterables;