From e5d81e76a261adc8668ff9e4ebd566b734548d76 Mon Sep 17 00:00:00 2001 From: RoboMWM Date: Fri, 20 Jan 2017 07:13:38 -0800 Subject: [PATCH] ok I didn't catch them all yea this needs to be rewritten --- src/me/ryanhamshire/GriefPrevention/DataStore.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/DataStore.java b/src/me/ryanhamshire/GriefPrevention/DataStore.java index b9fb7ce..0419fda 100644 --- a/src/me/ryanhamshire/GriefPrevention/DataStore.java +++ b/src/me/ryanhamshire/GriefPrevention/DataStore.java @@ -1686,10 +1686,13 @@ public abstract class DataStore message = message.replace("{" + i + "}", param); } - DeniedMessageEvent event = new DeniedMessageEvent(messageID, message); - Bukkit.getPluginManager().callEvent(event); - - return event.getMessage(); + if (Bukkit.isPrimaryThread()) + { + DeniedMessageEvent event = new DeniedMessageEvent(messageID, message); + Bukkit.getPluginManager().callEvent(event); + return event.getMessage(); + } + return message; } //used in updating the data schema from 0 to 1.