diff --git a/pom.xml b/pom.xml index d6377ae..9abb5a7 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ com.nyancraft.reportrts ReportRTS - 1.2.3 + 2.0.0-54 com.comphenix.protocol diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/ReportRTSListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/ReportRTSListener.java index 8dd6ee3..97c37a3 100644 --- a/src/main/java/com/cnaude/purpleirc/GameListeners/ReportRTSListener.java +++ b/src/main/java/com/cnaude/purpleirc/GameListeners/ReportRTSListener.java @@ -20,12 +20,12 @@ import com.cnaude.purpleirc.PurpleBot; import com.cnaude.purpleirc.PurpleIRC; import com.nyancraft.reportrts.event.TicketAssignEvent; import com.nyancraft.reportrts.event.TicketClaimEvent; -import com.nyancraft.reportrts.event.TicketCompleteEvent; -import com.nyancraft.reportrts.event.TicketCreateEvent; import com.nyancraft.reportrts.event.TicketHoldEvent; import com.nyancraft.reportrts.event.TicketBroadcastEvent; +import com.nyancraft.reportrts.event.TicketCloseEvent; import com.nyancraft.reportrts.event.TicketReopenEvent; import com.nyancraft.reportrts.event.TicketUnclaimEvent; +import com.nyancraft.reportrts.event.TicketOpenEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -50,7 +50,7 @@ public class ReportRTSListener implements Listener { * @param event */ @EventHandler - public void onTicketCreateEvent(TicketCreateEvent event) { + public void onTicketCreateEvent(TicketOpenEvent event) { for (PurpleBot ircBot : plugin.ircBots.values()) { ircBot.reportRTSNotify(event.getTicket().getName(), event.getTicket(), ircBot.botNick, "rts-notify"); @@ -58,7 +58,7 @@ public class ReportRTSListener implements Listener { } @EventHandler - public void onTicketCompleteEvent(TicketCompleteEvent event) { + public void onTicketCompleteEvent(TicketCloseEvent event) { for (PurpleBot ircBot : plugin.ircBots.values()) { ircBot.reportRTSNotify(event.getTicket().getName(), event.getTicket(), ircBot.botNick, "rts-complete"); diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/ReportRTSHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/ReportRTSHook.java index d49a1f3..dc48028 100644 --- a/src/main/java/com/cnaude/purpleirc/Hooks/ReportRTSHook.java +++ b/src/main/java/com/cnaude/purpleirc/Hooks/ReportRTSHook.java @@ -18,7 +18,6 @@ package com.cnaude.purpleirc.Hooks; import com.cnaude.purpleirc.PurpleIRC; import com.nyancraft.reportrts.RTSFunctions; -import com.nyancraft.reportrts.util.Message; /** * @@ -37,7 +36,7 @@ public class ReportRTSHook { } public void modBroadcast(String name, String message) { - RTSFunctions.messageMods(Message.parse("broadcastMessage", name, message), false); + RTSFunctions.messageStaff(message, true); plugin.logDebug("RTSMB: " + message); } } diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java index a02b1c5..1923135 100644 --- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java +++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java @@ -643,11 +643,11 @@ public class ChatTokenizer { */ public String reportRTSTokenizer(String pName, String template, Ticket ticket) { String message = ticket.getMessage(); - String modName = ticket.getModName(); + String modName = ticket.getStaffName(); String displayModName = ""; String name = ticket.getName(); String world = ticket.getWorld(); - String modComment = ticket.getModComment(); + String modComment = ticket.getComments().last().getComment(); int id = ticket.getId(); if (message == null) { message = ""; @@ -730,9 +730,6 @@ public class ChatTokenizer { if (world == null) { world = ""; } - if (modComment == null) { - modComment = ""; - } if (modName == null) { modName = ""; }