diff --git a/lib/mChatSuite.jar b/lib/mChatSuite.jar
index aedce83..5fcd180 100644
Binary files a/lib/mChatSuite.jar and b/lib/mChatSuite.jar differ
diff --git a/plugin.yml b/plugin.yml
index d4de581..0a20e92 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,6 +1,6 @@
name: Vault
main: net.milkbowl.vault.Vault
-version: 1.2.18-b${BUILD_NUMBER}
+version: 1.2.19-b${BUILD_NUMBER}
authors: [cereal, Sleaker, mung3r]
website: http://dev.bukkit.org/server-mods/vault
load: startup
diff --git a/pom.xml b/pom.xml
index 5b5bf7c..280b0e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
net.milkbowl.vault
Vault
- 1.2.18-SNAPSHOT
+ 1.2.19-SNAPSHOT
UTF-8
@@ -14,19 +14,19 @@
1.3.1-R1.0
- de.hydrox.bukkit.DroxPerms
- DroxPerms
- 0.4.0-SNAPSHOT
- system
- ${project.basedir}/lib/DroxPerms-0.4.0-SNAPSHOT.jar
+ de.hydrox.bukkit.DroxPerms
+ DroxPerms
+ 0.4.0-SNAPSHOT
+ system
+ ${project.basedir}/lib/DroxPerms-0.4.0-SNAPSHOT.jar
+
+
+ net.krinsoft.privileges
+ Privileges
+ 1.4.0b45
+ system
+ ${project.basedir}/lib/Privileges.jar
-
- net.krinsoft.privileges
- Privileges
- 1.4.0b45
- system
- ${project.basedir}/lib/Privileges.jar
-
org.tyrannyofheaven.bukkit
zPermissions
@@ -49,11 +49,11 @@
${project.basedir}/lib/CurrencyCore.jar
- com.flobi.GoldIsMoney
- GoldIsMoney
- 1.0.0
- system
- ${project.basedir}/lib/GoldIsMoney.jar
+ com.flobi.GoldIsMoney
+ GoldIsMoney
+ 1.0.0
+ system
+ ${project.basedir}/lib/GoldIsMoney.jar
cosine.boseconomy.BOSEconomy
@@ -77,11 +77,11 @@
${project.basedir}/lib/EconXP.jar
- org.neocraft.AEco
- AEco
- 2.1
- system
- ${project.basedir}/lib/AEco-2.1.jar
+ org.neocraft.AEco
+ AEco
+ 2.1
+ system
+ ${project.basedir}/lib/AEco-2.1.jar
com.earth2me.essentials.Essentials
@@ -105,12 +105,12 @@
${project.basedir}/lib/eWallet.jar
- boardinggamer.mcmoney
- McMoney
- 1.2
- system
- ${project.basedir}/lib/McMoney.jar
-
+ boardinggamer.mcmoney
+ McMoney
+ 1.2
+ system
+ ${project.basedir}/lib/McMoney.jar
+
net.TheDgtl.iChat.iChat
iChat
@@ -149,7 +149,7 @@
in.mDev
mChatSuite
- DEV-b216
+ DEV-b275
system
${project.basedir}/lib/mChatSuite.jar
@@ -224,18 +224,18 @@
${project.basedir}/lib/Craftconomy3-b189.jar
- net.crystalyx.bukkit.simplyperms
- SimplyPerms
- 1.6.2
- system
- ${project.basedir}/lib/SimplyPerms.jar
+ net.crystalyx.bukkit.simplyperms
+ SimplyPerms
+ 1.6.2
+ system
+ ${project.basedir}/lib/SimplyPerms.jar
- Gringotts
- Gringotts
- 0.0.1-SNAPSHOT
- system
- ${project.basedir}/lib/Gringotts.jar
+ Gringotts
+ Gringotts
+ 0.0.1-SNAPSHOT
+ system
+ ${project.basedir}/lib/Gringotts.jar
@@ -300,8 +300,8 @@
true
true
- http://java.sun.com/j2se/1.5.0/docs/api/
- http://jd.bukkit.org/apidocs/
+ http://java.sun.com/j2se/1.5.0/docs/api/
+ http://jd.bukkit.org/apidocs/
MilkBukkit, 2011]]>
diff --git a/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java b/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java
index 3c9ad2a..aba4321 100644
--- a/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java
+++ b/src/net/milkbowl/vault/chat/plugins/Chat_mChatSuite.java
@@ -15,10 +15,10 @@
*/
package net.milkbowl.vault.chat.plugins;
+import com.miraclem4n.mchat.api.Reader;
+import com.miraclem4n.mchat.api.Writer;
+import com.miraclem4n.mchat.types.InfoType;
import in.mDev.MiracleM4n.mChatSuite.mChatSuite;
-import in.mDev.MiracleM4n.mChatSuite.api.Reader;
-import in.mDev.MiracleM4n.mChatSuite.api.Writer;
-import in.mDev.MiracleM4n.mChatSuite.types.InfoType;
import java.util.logging.Logger;
@@ -38,8 +38,6 @@ public class Chat_mChatSuite extends Chat {
private final String name = "mChatSuite";
private Plugin plugin = null;
private mChatSuite mChat = null;
- private Reader mReader = null;
- private Writer mWriter = null;
public Chat_mChatSuite(Plugin plugin, Permission perms) {
super(perms);
@@ -52,8 +50,6 @@ public class Chat_mChatSuite extends Chat {
Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChatSuite");
if (chat != null && chat.isEnabled()) {
mChat = (mChatSuite) chat;
- mReader = mChat.getReader();
- mWriter = mChat.getWriter();
log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "mChatSuite"));
}
}
@@ -67,8 +63,6 @@ public class Chat_mChatSuite extends Chat {
Plugin chat = plugin.getServer().getPluginManager().getPlugin("mChatSuite");
if (chat != null) {
mChat = (mChatSuite) chat;
- mReader = mChat.getReader();
- mWriter = mChat.getWriter();
log.info(String.format("[%s][Chat] %s hooked.", plugin.getDescription().getName(), "mChatSuite"));
}
}
@@ -79,8 +73,6 @@ public class Chat_mChatSuite extends Chat {
if (mChat != null) {
if (event.getPlugin().getDescription().getName().equals("mChatSuite")) {
mChat = null;
- mReader = null;
- mWriter = null;
log.info(String.format("[%s][Chat] %s un-hooked.", plugin.getDescription().getName(), "mChatSuite"));
}
}
@@ -99,7 +91,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getPlayerPrefix(String world, String player) {
- return mReader.getPrefix(player, InfoType.USER, world);
+ return Reader.getPrefix(player, InfoType.USER, world);
}
@Override
@@ -109,7 +101,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getPlayerSuffix(String world, String player) {
- return mReader.getSuffix(player, InfoType.USER, world);
+ return Reader.getSuffix(player, InfoType.USER, world);
}
@Override
@@ -119,7 +111,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getGroupPrefix(String world, String group) {
- return mReader.getPrefix(group, InfoType.GROUP, world);
+ return Reader.getPrefix(group, InfoType.GROUP, world);
}
@Override
@@ -129,7 +121,7 @@ public class Chat_mChatSuite extends Chat {
@Override
public String getGroupSuffix(String world, String group) {
- return mReader.getSuffix(group, InfoType.GROUP, world);
+ return Reader.getSuffix(group, InfoType.GROUP, world);
}
@Override
@@ -269,24 +261,24 @@ public class Chat_mChatSuite extends Chat {
private void setPlayerInfoValue(String world, String player, String node, Object value) {
if (world != null) {
- mWriter.setWorldVar(player, InfoType.USER, world, node, value.toString());
+ Writer.setWorldVar(player, InfoType.USER, world, node, value.toString());
} else {
- mWriter.setInfoVar(player, InfoType.USER, node, value.toString());
+ Writer.setInfoVar(player, InfoType.USER, node, value.toString());
}
}
private void setGroupInfoValue(String world, String group, String node, Object value) {
if (world != null) {
- mWriter.setWorldVar(group, InfoType.GROUP, world, node, value);
+ Writer.setWorldVar(group, InfoType.GROUP, world, node, value);
} else {
- mWriter.setInfoVar(group, InfoType.GROUP, node, value);
+ Writer.setInfoVar(group, InfoType.GROUP, node, value);
}
}
private String getPlayerInfoValue(String world, String player, String node) {
- return mReader.getInfo(player, InfoType.USER, world, node);
+ return Reader.getInfo(player, InfoType.USER, world, node);
}
private String getGroupInfoValue(String world, String group, String node) {
- return mReader.getInfo(group, InfoType.GROUP, world, node);
+ return Reader.getInfo(group, InfoType.GROUP, world, node);
}
}