diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index dc47b77fd..365a9b935 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -11,6 +11,8 @@ import net.citizensnpcs.api.event.CitizensReloadEvent; import net.citizensnpcs.api.exception.NPCException; import net.citizensnpcs.api.exception.NPCLoadException; import net.citizensnpcs.api.npc.NPC; +import net.citizensnpcs.api.scripting.ScriptCompiler; +import net.citizensnpcs.api.trait.EventRegistrar; import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.api.util.DatabaseStorage; import net.citizensnpcs.api.util.NBTStorage; @@ -177,6 +179,8 @@ public class Citizens extends JavaPlugin { // Register commands registerCommands(); + registerScriptHelpers(); + getServer().getScheduler().scheduleSyncRepeatingTask(this, new NPCUpdater(npcManager), 0, 1); Messaging.log("v" + getDescription().getVersion() + " enabled."); @@ -222,6 +226,12 @@ public class Citizens extends JavaPlugin { }.start(); } + private void registerScriptHelpers() { + ScriptCompiler compiler = CitizensAPI.getScriptCompiler(); + compiler.registerGlobalContextProvider(new EventRegistrar(this)); + + } + private void registerCommands() { commands.setInjector(new Injector(this)); diff --git a/src/main/java/net/citizensnpcs/trait/text/prompt/StartPrompt.java b/src/main/java/net/citizensnpcs/trait/text/prompt/StartPrompt.java index 725857f20..316bda013 100644 --- a/src/main/java/net/citizensnpcs/trait/text/prompt/StartPrompt.java +++ b/src/main/java/net/citizensnpcs/trait/text/prompt/StartPrompt.java @@ -10,7 +10,7 @@ import org.bukkit.conversations.StringPrompt; import org.bukkit.entity.Player; public class StartPrompt extends StringPrompt { - private Text text; + private final Text text; public StartPrompt(Text text) { this.text = text;