Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 11:58:06 +01:00
Code Issues Projects Releases Wiki Activity
19b4f78b55
Paper/Spigot-Server-Patches/0229-Fill-Profile-Property-Events.patch

45 lines
2.0 KiB
Diff
Raw Normal View History

[CI-SKIP] merge profile fill fix into base patch
2018-11-09 00:50:17 +01:00
From e7c6b3cc9faa0245c366ec6c840ff76155c6a3fa Mon Sep 17 00:00:00 2001
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
From: Aikar <aikar@aikar.co>
Date: Tue, 2 Jan 2018 00:31:26 -0500
Subject: [PATCH] Fill Profile Property Events
Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API
to fill in textures for example.
If Mojang API does need to be hit, event fire so you can get the results.
This is useful for implementing a ProfileCache for Player Skulls
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
[CI-SKIP] merge profile fill fix into base patch
2018-11-09 00:50:17 +01:00
index 4b2a67423f..61cfdf73c8 100644
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
--- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
@@ -1,5 +1,7 @@
package com.destroystokyo.paper.profile;
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
+import com.destroystokyo.paper.event.profile.FillProfileEvent;
+import com.destroystokyo.paper.event.profile.PreFillProfileEvent;
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
[CI-SKIP] merge profile fill fix into base patch
2018-11-09 00:50:17 +01:00
@@ -19,7 +21,15 @@ public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionServi
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
@Override
public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) {
- return super.fillProfileProperties(profile, requireSecure);
[CI-SKIP] merge profile fill fix into base patch
2018-11-09 00:50:17 +01:00
+ CraftPlayerProfile playerProfile = (CraftPlayerProfile) CraftPlayerProfile.asBukkitMirror(profile);
+ new PreFillProfileEvent(playerProfile).callEvent();
+ profile = playerProfile.getGameProfile();
improve Profile Fill Events early return logic - #997
2018-01-29 01:40:19 +01:00
+ if (profile.isComplete() && profile.getProperties().containsKey("textures")) {
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
+ return profile;
+ }
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
+ GameProfile gameProfile = super.fillProfileProperties(profile, requireSecure);
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
+ new FillProfileEvent(CraftPlayerProfile.asBukkitMirror(gameProfile)).callEvent();
+ return gameProfile;
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
}
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
Improve Profile API to directly extend Yggdrasil, Resolves #1117 This improves plugins like Citizens that rely on direct instance of Yggdrasil implementations. Instead of wrapping, directly extend and override the methods. Went ahead and wrapped all of the services in prep in the base patch, then features modify what they need
2018-05-11 05:01:52 +02:00
@Override
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
--
[CI-SKIP] merge profile fill fix into base patch
2018-11-09 00:50:17 +01:00
2.19.1
Fill Profile Property Events Allows plugins to populate profile properties from local sources to avoid calls out to Mojang API to fill in textures for example. If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls
2018-01-19 06:55:38 +01:00
Reference in New Issue Copy Permalink