|
@@ -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;}
|
|
|
}
|