From 18ee843380ed758d2b48eb2164e42ff95a2f8c4a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 1 Feb 2018 23:24:27 -0500
Subject: [PATCH] Properly flag profile events as async as needed

---
 .../0084-Fill-Profile-Property-Events.patch        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Spigot-API-Patches/0084-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0084-Fill-Profile-Property-Events.patch
index 268d84535a..ba01ccc60c 100644
--- a/Spigot-API-Patches/0084-Fill-Profile-Property-Events.patch
+++ b/Spigot-API-Patches/0084-Fill-Profile-Property-Events.patch
@@ -1,4 +1,4 @@
-From 4639e25b3f054fe8f9c01911b5d8be559a77a643 Mon Sep 17 00:00:00 2001
+From 4108c18902957c3f99f85ef35e3de5e3cce53c4a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:08 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -12,10 +12,10 @@ This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
 new file mode 100644
-index 00000000..a893dda1
+index 00000000..e8f6e7c1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,72 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -56,6 +56,7 @@ index 00000000..a893dda1
 +    private final PlayerProfile profile;
 +
 +    public FillProfileEvent(@Nonnull PlayerProfile profile) {
++        super(!org.bukkit.Bukkit.isPrimaryThread());
 +        this.profile = profile;
 +    }
 +
@@ -89,10 +90,10 @@ index 00000000..a893dda1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
 new file mode 100644
-index 00000000..e34312c1
+index 00000000..f7b332e1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,74 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -135,6 +136,7 @@ index 00000000..e34312c1
 +    private final PlayerProfile profile;
 +
 +    public PreFillProfileEvent(PlayerProfile profile) {
++        super(!org.bukkit.Bukkit.isPrimaryThread());
 +        this.profile = profile;
 +    }
 +
@@ -167,5 +169,5 @@ index 00000000..e34312c1
 +    }
 +}
 -- 
-2.15.1
+2.14.3