Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2024-09-29 06:57:31 +02:00
Code Issues Projects Releases Wiki Activity

Update for RTS 2.0.0 build 54.

Browse Source
This commit is contained in:
cnaude 2016-04-17 22:13:59 -07:00
parent fddf4f8377
commit b2eb1eb887
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -156,7 +156,7 @@
<dependency> <dependency>
<groupId>com.nyancraft.reportrts</groupId> <groupId>com.nyancraft.reportrts</groupId>
<artifactId>ReportRTS</artifactId> <artifactId>ReportRTS</artifactId>
<version>1.2.3</version> <version>2.0.0-54</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>

8
src/main/java/com/cnaude/purpleirc/GameListeners/ReportRTSListener.java
View File

@ -20,12 +20,12 @@ import com.cnaude.purpleirc.PurpleBot;
import com.cnaude.purpleirc.PurpleIRC; import com.cnaude.purpleirc.PurpleIRC;
import com.nyancraft.reportrts.event.TicketAssignEvent; import com.nyancraft.reportrts.event.TicketAssignEvent;
import com.nyancraft.reportrts.event.TicketClaimEvent; 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.TicketHoldEvent;
import com.nyancraft.reportrts.event.TicketBroadcastEvent; import com.nyancraft.reportrts.event.TicketBroadcastEvent;
import com.nyancraft.reportrts.event.TicketCloseEvent;
import com.nyancraft.reportrts.event.TicketReopenEvent; import com.nyancraft.reportrts.event.TicketReopenEvent;
import com.nyancraft.reportrts.event.TicketUnclaimEvent; import com.nyancraft.reportrts.event.TicketUnclaimEvent;
import com.nyancraft.reportrts.event.TicketOpenEvent;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -50,7 +50,7 @@ public class ReportRTSListener implements Listener {
* @param event * @param event
*/ */
@EventHandler @EventHandler
public void onTicketCreateEvent(TicketCreateEvent event) { public void onTicketCreateEvent(TicketOpenEvent event) {
for (PurpleBot ircBot : plugin.ircBots.values()) { for (PurpleBot ircBot : plugin.ircBots.values()) {
ircBot.reportRTSNotify(event.getTicket().getName(), ircBot.reportRTSNotify(event.getTicket().getName(),
event.getTicket(), ircBot.botNick, "rts-notify"); event.getTicket(), ircBot.botNick, "rts-notify");
@ -58,7 +58,7 @@ public class ReportRTSListener implements Listener {
} }
@EventHandler @EventHandler
public void onTicketCompleteEvent(TicketCompleteEvent event) { public void onTicketCompleteEvent(TicketCloseEvent event) {
for (PurpleBot ircBot : plugin.ircBots.values()) { for (PurpleBot ircBot : plugin.ircBots.values()) {
ircBot.reportRTSNotify(event.getTicket().getName(), ircBot.reportRTSNotify(event.getTicket().getName(),
event.getTicket(), ircBot.botNick, "rts-complete"); event.getTicket(), ircBot.botNick, "rts-complete");

3
src/main/java/com/cnaude/purpleirc/Hooks/ReportRTSHook.java
View File

@ -18,7 +18,6 @@ package com.cnaude.purpleirc.Hooks;
import com.cnaude.purpleirc.PurpleIRC; import com.cnaude.purpleirc.PurpleIRC;
import com.nyancraft.reportrts.RTSFunctions; 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) { public void modBroadcast(String name, String message) {
RTSFunctions.messageMods(Message.parse("broadcastMessage", name, message), false); RTSFunctions.messageStaff(message, true);
plugin.logDebug("RTSMB: " + message); plugin.logDebug("RTSMB: " + message);
} }
} }

7
src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
View File

@ -643,11 +643,11 @@ public class ChatTokenizer {
*/ */
public String reportRTSTokenizer(String pName, String template, Ticket ticket) { public String reportRTSTokenizer(String pName, String template, Ticket ticket) {
String message = ticket.getMessage(); String message = ticket.getMessage();
String modName = ticket.getModName(); String modName = ticket.getStaffName();
String displayModName = ""; String displayModName = "";
String name = ticket.getName(); String name = ticket.getName();
String world = ticket.getWorld(); String world = ticket.getWorld();
String modComment = ticket.getModComment(); String modComment = ticket.getComments().last().getComment();
int id = ticket.getId(); int id = ticket.getId();
if (message == null) { if (message == null) {
message = ""; message = "";
@ -730,9 +730,6 @@ public class ChatTokenizer {
if (world == null) { if (world == null) {
world = ""; world = "";
} }
if (modComment == null) {
modComment = "";
}
if (modName == null) { if (modName == null) {
modName = ""; modName = "";
} }