From 67bfb40dd51b8ecaea5076575ac28380694c9779 Mon Sep 17 00:00:00 2001
From: Shrek5InTheatres2019 <liam@tannock.net>
Date: Mon, 9 Sep 2019 16:50:05 -0700
Subject: [PATCH] fixing the things

---
 .../players/McMMOPlayerProfileLoadEvent.java       | 14 +++++++++-----
 .../gmail/nossr50/listeners/PlayerListener.java    |  1 -
 .../runnables/player/PlayerProfileLoadingTask.java |  4 +---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/events/players/McMMOPlayerProfileLoadEvent.java b/src/main/java/com/gmail/nossr50/events/players/McMMOPlayerProfileLoadEvent.java
index 508a9886c..3fa9407b1 100644
--- a/src/main/java/com/gmail/nossr50/events/players/McMMOPlayerProfileLoadEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/players/McMMOPlayerProfileLoadEvent.java
@@ -1,17 +1,19 @@
 package com.gmail.nossr50.events.players;
 
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-public class McMMOPlayerProfileLoadEvent extends PlayerEvent implements Cancellable {
+public class McMMOPlayerProfileLoadEvent extends Event implements Cancellable {
     private boolean cancelled;
     private PlayerProfile profile;
     private Player player;
     public McMMOPlayerProfileLoadEvent(Player player, PlayerProfile profile){
-        super(player);
+        super(!Bukkit.isPrimaryThread());
 
         this.cancelled = false;
         this.profile = profile;
@@ -19,12 +21,12 @@ public class McMMOPlayerProfileLoadEvent extends PlayerEvent implements Cancella
     }
     @Override
     public boolean isCancelled() {
-        return cancelled;
+        return this.cancelled;
     }
 
     @Override
-    public void setCancelled(boolean b) {
-        this.cancelled = b;
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
     }
 
     public PlayerProfile getProfile(){return this.profile;}
@@ -38,4 +40,6 @@ public class McMMOPlayerProfileLoadEvent extends PlayerEvent implements Cancella
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
+    public Player getPlayer() {return player;}
 }
diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index 8a33ba4f0..ede4468b1 100644
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -68,7 +68,6 @@ public class PlayerListener implements Listener {
      *
      * @param event The event to monitor
      */
-
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         /* WORLD BLACKLIST CHECK */
diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java
index 77cd19373..a005e39c7 100644
--- a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java
@@ -50,9 +50,7 @@ public class PlayerProfileLoadingTask extends BukkitRunnable {
         // If successful, schedule the apply
         if (profile.isLoaded()) {
             new ApplySuccessfulProfile(new McMMOPlayer(player, profile)).runTask(mcMMO.p);
-            Bukkit.getScheduler().runTask(mcMMO.p, () -> {
-                EventUtils.callPlayerProfileLoadEvent(player, profile);
-            });
+            EventUtils.callPlayerProfileLoadEvent(player, profile);
             return;
         }