diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-10-16 20:59:39 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-10-16 21:05:33 +0100 |
| commit | 6f85761f7fc7949b478c0dec44240f93d4b08a02 (patch) | |
| tree | 1da56d3d8ca883cfb71e766600f336d39ecbccb2 /EssentialsChat | |
| parent | cf9d79d24c8b33d10585a3fc97bc38554dee6d8b (diff) | |
| download | Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar.gz Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar.lz Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.tar.xz Essentials-6f85761f7fc7949b478c0dec44240f93d4b08a02.zip | |
Extract CommandSender to CommandSource, this should prevent Ess user object leaks.
Diffstat (limited to 'EssentialsChat')
| -rw-r--r-- | EssentialsChat/EssentialsChat.iml | 27 | ||||
| -rw-r--r-- | EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java | 2 |
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; } |