From b41dde0d2be16262a79f5fead550d44e075a659d Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Wed, 25 Jul 2018 21:55:25 -0500 Subject: [PATCH] Move part of last change into proper file --- .../Basic-PlayerProfile-API.patch | 10 +------- .../Profile-Lookup-Events.patch | 23 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/Spigot-API-Patches/Basic-PlayerProfile-API.patch b/Spigot-API-Patches/Basic-PlayerProfile-API.patch index b4b7de1185..c05b5fbcd9 100644 --- a/Spigot-API-Patches/Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/Basic-PlayerProfile-API.patch @@ -7,14 +7,12 @@ Provides basic elements of a PlayerProfile to be used by future API/events diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java new file mode 100644 -index 00000000..e060c38a +index 00000000..1a69e5f7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java @@ -0,0 +0,0 @@ +package com.destroystokyo.paper.profile; + -+import com.mojang.authlib.GameProfile; -+ +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.Collection; @@ -153,12 +151,6 @@ index 00000000..e060c38a + default boolean hasTextures() { + return hasProperty("textures"); + } -+ -+ /** -+ * @deprecated Will be removed in 1.13 -+ */ -+ @Deprecated -+ GameProfile getGameProfile(); +} diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java new file mode 100644 diff --git a/Spigot-API-Patches/Profile-Lookup-Events.patch b/Spigot-API-Patches/Profile-Lookup-Events.patch index 2f40b58821..bd5bd6f936 100644 --- a/Spigot-API-Patches/Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/Profile-Lookup-Events.patch @@ -167,27 +167,4 @@ index 00000000..e5a5986a + } + +} -diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java -index e060c38a..1a69e5f7 100644 ---- a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java -+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java -@@ -0,0 +0,0 @@ - package com.destroystokyo.paper.profile; - --import com.mojang.authlib.GameProfile; -- - import javax.annotation.Nonnull; - import javax.annotation.Nullable; - import java.util.Collection; -@@ -0,0 +0,0 @@ public interface PlayerProfile { - default boolean hasTextures() { - return hasProperty("textures"); - } -- -- /** -- * @deprecated Will be removed in 1.13 -- */ -- @Deprecated -- GameProfile getGameProfile(); - } -- \ No newline at end of file