summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-07-13 17:31:14 +0100
committerKHobbits <rob@khobbits.co.uk>2013-07-13 17:31:14 +0100
commitadb5189d42c8707bbf8ccdf7988f0c96ea5d04c2 (patch)
tree01964be8f349c3ef8a14bf396250271f8d39a1be
parentef3b052c644542bbea3fa668c60b03baf3e15861 (diff)
downloadEssentials-adb5189d42c8707bbf8ccdf7988f0c96ea5d04c2.tar
Essentials-adb5189d42c8707bbf8ccdf7988f0c96ea5d04c2.tar.gz
Essentials-adb5189d42c8707bbf8ccdf7988f0c96ea5d04c2.tar.lz
Essentials-adb5189d42c8707bbf8ccdf7988f0c96ea5d04c2.tar.xz
Essentials-adb5189d42c8707bbf8ccdf7988f0c96ea5d04c2.zip
Add 'No one listening' message stub, will be empty by default and thus not sent.
-rw-r--r--Essentials/src/messages.properties1
-rw-r--r--Essentials/src/messages_da.properties2
-rw-r--r--Essentials/src/messages_de.properties2
-rw-r--r--Essentials/src/messages_en.properties1
-rw-r--r--Essentials/src/messages_es.properties2
-rw-r--r--Essentials/src/messages_fi.properties2
-rw-r--r--Essentials/src/messages_fr.properties2
-rw-r--r--Essentials/src/messages_it.properties2
-rw-r--r--Essentials/src/messages_nl.properties2
-rw-r--r--Essentials/src/messages_pl.properties2
-rw-r--r--Essentials/src/messages_pt.properties2
-rw-r--r--Essentials/src/messages_ro.properties2
-rw-r--r--Essentials/src/messages_sv.properties2
-rw-r--r--Essentials/src/messages_zh.properties2
-rw-r--r--Essentials/src/messages_zh_HK.properties2
-rw-r--r--Essentials/src/messages_zh_TW.properties2
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java3
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java4
18 files changed, 4 insertions, 33 deletions
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 0abca5136..45e896bd9 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -518,5 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
localNoOne=
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 22df30bc2..5f52a32ce 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index ca66fa09c..822c406ce 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Alle Gegenst\u00e4nde im Inventar und R\u00fcst
inventoryClearingAllStack=\u00a76Alle\u00a7c {0} \u00a76von {1} \u00a76entfernt.
inventoryClearingStack=\u00a7c {0} {1} \u00a76von {2} \u00a76entfernt.
inventoryClearFail=\u00a74Spieler {0} \u00a74hat keine\u00a7c {1} {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 0abca5136..45e896bd9 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -518,5 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
localNoOne=
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 9e42b7351..7fcb192f8 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 4fd8d63b8..166221169 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index c3d4fb018..8e25d3b70 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Tous les items de l''inventaire et l''armure de
inventoryClearingAllStack=\u00a76Tous les\u00a7c {0} \u00a76de l''inventaire de {1}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
inventoryClearingStack=\u00a7c{0} \u00a7c {1} \u00a76ont \u00e9t\u00e9 supprim\u00e9s de l''inventaire de {2}\u00a76.
inventoryClearFail=\u00a74Le joueur {0} \u00a74n''a pas\u00a7c {1}\u00a7c {2}\u00a74 sur lui.
-
-
localNoOne=
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index fc7feecfe..06e0220e7 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 19f06a24a..67c801691 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Alle inventaris voorwerpen en het harnas van {0
inventoryClearingAllStack=\u00a76Alle\u00a7c {0} \u00a76van {1}\u00a76 is verwijderd.
inventoryClearingStack=\u00a76\u00a7c {0} \u00a76stuks\u00a7c {1} \u00a76zijn verwijderd uit de inventaris van {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74heeft geen\u00a7c {1} \u00a74stuks\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index c528fcd6d..c768ed0ae 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a77Wyczyszczono caly ekwipunek i zbroje gracza {0}
inventoryClearingAllStack=\u00a77Wyczyszczono wszystko\u00a7c {0} \u00a77od {1}\u00a77.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index dcfd4369d..18c7f31de 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index f64e2e105..0766b5118 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
index c68077845..42b01b078 100644
--- a/Essentials/src/messages_sv.properties
+++ b/Essentials/src/messages_sv.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Rensade alla inventory objekt och rustning fr\u
inventoryClearingAllStack=\u00a76Rensade alla\u00a7c {0} \u00a76fr\u00e5n {1}\u00a76.
inventoryClearingStack=\u00a76Tog bort \u00a7c {0} \u00a76av\u00a7c {1} \u00a76fr\u00e5n {2}\u00a76.
inventoryClearFail=\u00a74Spelaren {0} \u00a74har inte \u00a7c {1} \u00a74av\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_zh.properties b/Essentials/src/messages_zh.properties
index fbec9bbfd..0dc0e57ba 100644
--- a/Essentials/src/messages_zh.properties
+++ b/Essentials/src/messages_zh.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 75f79317c..f65c27fbd 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index fb51da23b..b29c29ae5 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -518,6 +518,4 @@ inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\
inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
-
-
localNoOne=
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
index 51472163f..f2912db22 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
@@ -2,16 +2,13 @@ package com.earth2me.essentials.chat;
import com.earth2me.essentials.IEssentials;
import com.earth2me.essentials.User;
-import com.earth2me.essentials.utils.StringUtil;
import com.earth2me.essentials.utils.FormatUtil;
-import java.text.MessageFormat;
import java.util.Locale;
import java.util.Map;
import org.bukkit.Server;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.scoreboard.Team;
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
index 4fe8e7df5..0b58b0bfb 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerNormal.java
@@ -134,6 +134,10 @@ public class EssentialsChatPlayerListenerNormal extends EssentialsChatPlayer
}
}
}
+
+ if (outList.size() < 2) {
+ event.getPlayer().sendMessage(_("localNoOne"));
+ }
LocalChatSpyEvent spyEvent = new LocalChatSpyEvent(event.isAsynchronous(), event.getPlayer(), event.getFormat(), event.getMessage(), spyList);
server.getPluginManager().callEvent(spyEvent);