mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
Move part of last change into proper file
This commit is contained in:
parent
e64513b585
commit
64e27b40d9
2 changed files with 4 additions and 35 deletions
|
@ -1,4 +1,4 @@
|
|||
From 97a6a2c62004126fa289c26630892ada77e67845 Mon Sep 17 00:00:00 2001
|
||||
From bdcaf28a89037f365f2f9020eae7a11d8fe5080e Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 15 Jan 2018 21:46:46 -0500
|
||||
Subject: [PATCH] Basic PlayerProfile API
|
||||
|
@ -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 +1,149 @@
|
||||
@@ -0,0 +1,141 @@
|
||||
+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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f3b8cae8d19b09d483ade52dd74ee6130ef912e1 Mon Sep 17 00:00:00 2001
|
||||
From 97ffcb9256d9f121a14c42cfc8142f250bafac71 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 17 Jun 2017 16:30:44 -0400
|
||||
Subject: [PATCH] Profile Lookup Events
|
||||
|
@ -167,29 +167,6 @@ 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
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.destroystokyo.paper.profile;
|
||||
|
||||
-import com.mojang.authlib.GameProfile;
|
||||
-
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Collection;
|
||||
@@ -140,10 +138,4 @@ public interface PlayerProfile {
|
||||
default boolean hasTextures() {
|
||||
return hasProperty("textures");
|
||||
}
|
||||
-
|
||||
- /**
|
||||
- * @deprecated Will be removed in 1.13
|
||||
- */
|
||||
- @Deprecated
|
||||
- GameProfile getGameProfile();
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
|
||||
|
|
Loading…
Reference in a new issue