mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 08:45:11 +00:00
Merge remote-tracking branch 'origin/dev' into animation-events
# Conflicts: # src/api # src/main/java/noppes/npcs/controllers/data/AnimationData.java
This commit is contained in:
commit
d055d434df
377 files changed
+2385
-1098
No files matched your search
@@ -562,11 +562,9 @@ public class EventHooks {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static void onScriptedCommand(CustomNPCsEvent.ScriptedCommandEvent event) {
|
||||
ForgeDataScript handler = ScriptController.Instance.forgeScripts;
|
||||
if (handler.isEnabled()) {
|
||||
handler.callScript(EnumScriptType.SCRIPT_COMMAND, event);
|
||||
}
|
||||
public static boolean onScriptedCommand(CustomNPCsEvent.ScriptedCommandEvent event) {
|
||||
ScriptController.Instance.playerScripts.callScript(EnumScriptType.SCRIPT_COMMAND, event);
|
||||
return NpcAPI.EVENT_BUS.post(event);
|
||||
}
|
||||
|
||||
public static void onCustomGuiButton(IPlayer player, ICustomGui gui, int buttonId) {
|
||||
|
||||
Reference in new issue
Block a user