diff --git a/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java b/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java index 0c7f86c32..4625a761c 100644 --- a/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java +++ b/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java @@ -1,62 +1,11 @@ package com.gmail.nossr50.events.chat; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - /** * Called when a chat is sent to the admin chat channel */ -public class McMMOAdminChatEvent extends Event implements Cancellable { - private boolean cancelled; - private String sender, message; +public class McMMOAdminChatEvent extends McMMOChatEvent{ public McMMOAdminChatEvent(String sender, String message) { - this.sender = sender; - this.message = message; - } - - /** - * @return String name of the player who sent the chat, or "Console" - */ - public String getSender() { - return sender; - } - - /** - * @return String message that will be sent - */ - public String getMessage() { - return message; - } - - /** - * @param message String message to be sent in chat - */ - public void setMessage(String message) { - this.message = message; - } - - /** Rest of file is required boilerplate for custom events **/ - private static final HandlerList handlers = new HandlerList(); - - @Override - public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** Following are required for Cancellable **/ - @Override - public boolean isCancelled() { - return cancelled; - } - - @Override - public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; + super(sender, message); } } diff --git a/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java b/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java new file mode 100644 index 000000000..fafa6da9f --- /dev/null +++ b/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java @@ -0,0 +1,60 @@ +package com.gmail.nossr50.events.chat; + +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class McMMOChatEvent extends Event implements Cancellable{ + private boolean cancelled; + private String sender; + private String message; + + public McMMOChatEvent(String sender, String message) { + this.sender = sender; + this.message = message; + } + + /** + * @return String name of the player who sent the chat, or "Console" + */ + public String getSender() { + return sender; + } + + /** + * @return String message that will be sent + */ + public String getMessage() { + return message; + } + + /** + * @param message String message to be sent in chat + */ + public void setMessage(String message) { + this.message = message; + } + + /** Rest of file is required boilerplate for custom events **/ + private static final HandlerList handlers = new HandlerList(); + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + /** Following are required for Cancellable **/ + @Override + public boolean isCancelled() { + return cancelled; + } + + @Override + public void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } +} diff --git a/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java b/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java index e527233ec..112dd24cd 100644 --- a/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java +++ b/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java @@ -1,27 +1,14 @@ package com.gmail.nossr50.events.chat; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - /** * Called when a chat is sent to a party channel */ -public class McMMOPartyChatEvent extends Event implements Cancellable { - private boolean cancelled; - private String sender, party, message; +public class McMMOPartyChatEvent extends McMMOChatEvent{ + private String party; public McMMOPartyChatEvent(String sender, String party, String message) { - this.sender = sender; + super(sender, message); this.party = party; - this.message = message; - } - - /** - * @return String name of the player who sent the chat, or "Console" - */ - public String getSender() { - return sender; } /** @@ -30,41 +17,4 @@ public class McMMOPartyChatEvent extends Event implements Cancellable { public String getParty() { return party; } - - /** - * @return String message that will be sent - */ - public String getMessage() { - return message; - } - - /** - * @param message String message to be sent in chat - */ - public void setMessage(String message) { - this.message = message; - } - - /** Rest of file is required boilerplate for custom events **/ - private static final HandlerList handlers = new HandlerList(); - - @Override - public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - - /** Following are required for Cancellable **/ - @Override - public boolean isCancelled() { - return cancelled; - } - - @Override - public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } }