summaryrefslogtreecommitdiffstats
path: root/EssentialsChat
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-10-16 20:59:39 +0100
committerKHobbits <rob@khobbits.co.uk>2013-10-16 21:05:33 +0100
commitff46b39f2b42abbe4ce8dc39e564f3dc71a2a104 (patch)
treed4438b241ea1b251105a2622aada79542c2f41ce /EssentialsChat
parentd6dfe5da65fdc9bda682615488f5dc9917c394b5 (diff)
downloadEssentials-ff46b39f2b42abbe4ce8dc39e564f3dc71a2a104.tar
Essentials-ff46b39f2b42abbe4ce8dc39e564f3dc71a2a104.tar.gz
Essentials-ff46b39f2b42abbe4ce8dc39e564f3dc71a2a104.tar.lz
Essentials-ff46b39f2b42abbe4ce8dc39e564f3dc71a2a104.tar.xz
Essentials-ff46b39f2b42abbe4ce8dc39e564f3dc71a2a104.zip
Extract CommandSender to CommandSource, this should prevent Ess user object leaks.
Diffstat (limited to 'EssentialsChat')
-rw-r--r--EssentialsChat/EssentialsChat.iml27
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java2
2 files changed, 28 insertions, 1 deletions
diff --git a/EssentialsChat/EssentialsChat.iml b/EssentialsChat/EssentialsChat.iml
new file mode 100644
index 000000000..df12eff90
--- /dev/null
+++ b/EssentialsChat/EssentialsChat.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="Essentials" />
+ <orderEntry type="module" module-name="EssentialsGroupManager" />
+ <orderEntry type="library" name="Maven: org.bukkit:bukkit:1.4.2-R0.3-SNAPSHOT" level="project" />
+ <orderEntry type="library" name="Maven: org.projectlombok:lombok:0.11.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.tukaani:xz:1.0" level="project" />
+ <orderEntry type="library" name="Maven: cosine:BOSEconomy:0.7" level="project" />
+ <orderEntry type="library" name="Maven: com.iConomy:iConomy:5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.iCo6:iConomy:6.0" level="project" />
+ <orderEntry type="library" name="Maven: me.ashtheking:MultiCurrency:0.05" level="project" />
+ <orderEntry type="library" name="Maven: net.milkbowl:Vault:1.2" level="project" />
+ </component>
+</module>
+
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
index 7fff85ff8..78b9d1a7f 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
@@ -82,7 +82,7 @@ public abstract class EssentialsChatPlayer implements Listener
}
catch (ChargeException e)
{
- ess.showError(chatStore.getUser().getBase(), e, chatStore.getLongType());
+ ess.showError(chatStore.getUser().getSource(), e, chatStore.getLongType());
event.setCancelled(true);
return false;
}