diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 7e81a88..9c40c93 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -145,7 +145,7 @@
net.ess3
essentials
- 2.13.121
+ 2.14
compile
diff --git a/pom.xml b/pom.xml
index 27b5857..ee8ec48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
net.ess3
essentials
- 2.13.121
+ 2.14
jar
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java
index 861c37e..60598e8 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/EssentialsListener.java
@@ -36,7 +36,7 @@ public void onAfkStatusChangeEvent(AfkStatusChangeEvent event) {
IUser user = event.getAffected();
plugin.logDebug("AFK: " + user.getName() + ":" + user.isAfk());
for (PurpleBot ircBot : plugin.ircBots.values()) {
- ircBot.essentialsAFK(user.getBase(), user.isAfk());
+ ircBot.essentialsAFK(user.getBase(), !user.isAfk());
}
}
}
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java
index 8ee6aa1..2598c24 100644
--- a/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java
+++ b/src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerJoinListener.java
@@ -6,12 +6,10 @@
import com.cnaude.purpleirc.PurpleBot;
import com.cnaude.purpleirc.PurpleIRC;
-import java.io.IOException;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
-import org.pircbotx.exception.IrcException;
/**
*
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
index e570cb6..913ce3d 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -2452,9 +2452,9 @@ public void essentialsAFK(Player player, boolean afk) {
}
String template;
if (afk) {
- template = plugin.getMsgTemplate(botNick, TemplateName.PLAYER_AFK);
+ template = plugin.getMsgTemplate(botNick, TemplateName.ESS_PLAYER_AFK);
} else {
- template = plugin.getMsgTemplate(botNick, TemplateName.PLAYER_NOT_AFK);
+ template = plugin.getMsgTemplate(botNick, TemplateName.ESS_PLAYER_NOT_AFK);
}
plugin.logDebug("Sending AFK message to " + channelName);
asyncIRCMessage(channelName, plugin.tokenizer.gamePlayerAFKTokenizer(player, template));
diff --git a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
index 2a736b1..eba5b5f 100644
--- a/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
+++ b/src/main/java/com/cnaude/purpleirc/PurpleIRC.java
@@ -3,6 +3,7 @@
import com.cnaude.purpleirc.GameListeners.CleverNotchListener;
import com.cnaude.purpleirc.GameListeners.DeathMessagesListener;
import com.cnaude.purpleirc.GameListeners.DynmapListener;
+import com.cnaude.purpleirc.GameListeners.EssentialsListener;
import com.cnaude.purpleirc.GameListeners.GamePlayerChatListener;
import com.cnaude.purpleirc.GameListeners.GamePlayerCommandPreprocessingListener;
import com.cnaude.purpleirc.GameListeners.GamePlayerDeathListener;
@@ -271,14 +272,12 @@ public void onEnable() {
} else {
logInfo("ReportRTS not detected.");
}
- /*
- if (isPluginEnabled("Essentials")) {
- logInfo("Enabling Essentials support.");
- getServer().getPluginManager().registerEvents(new EssentialsListener(this), this);
- } else {
- logInfo("Essentials not detected.");
- }
- */
+ if (isPluginEnabled("Essentials")) {
+ logInfo("Enabling Essentials support.");
+ getServer().getPluginManager().registerEvents(new EssentialsListener(this), this);
+ } else {
+ logInfo("Essentials not detected.");
+ }
commandHandlers = new CommandHandlers(this);
getCommand("irc").setExecutor(commandHandlers);
regexGlobber = new RegexGlobber();
diff --git a/src/main/java/com/cnaude/purpleirc/TemplateName.java b/src/main/java/com/cnaude/purpleirc/TemplateName.java
index f8a56fd..23e9631 100644
--- a/src/main/java/com/cnaude/purpleirc/TemplateName.java
+++ b/src/main/java/com/cnaude/purpleirc/TemplateName.java
@@ -69,8 +69,8 @@ public class TemplateName {
public final static String IRC_NOTICE = "irc-notice";
public final static String IRC_CONSOLE_CHAT = "irc-console-chat";
- public final static String PLAYER_AFK = "player-afk";
- public final static String PLAYER_NOT_AFK = "player-not-afk";
+ public final static String ESS_PLAYER_AFK = "ess-player-afk";
+ public final static String ESS_PLAYER_NOT_AFK = "ess-player-not-afk";
public final static String INVALID_IRC_COMMAND = "invalid-irc-command";
public final static String NO_PERM_FOR_IRC_COMMAND = "no-perm-for-irc-command";
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
index c6c7927..98cbf19 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package com.cnaude.purpleirc.Utilities;
import com.cnaude.purpleirc.PurpleBot;
@@ -87,7 +83,7 @@ public void remFromTabList(String name) {
plugin.logError(e.getMessage());
}
}
-
+
/**
*
* @param player