summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-29 08:48:29 +0000
committerementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-29 08:48:29 +0000
commit94774a32ac6c84a3930571e1c9691f4bd7e6b46b (patch)
tree576356d3e521f189acb8eb7d62cd8d85764edf2c
parent2b915e72fa95008b7cca1d8cac55973585fea699 (diff)
downloadEssentials-94774a32ac6c84a3930571e1c9691f4bd7e6b46b.tar
Essentials-94774a32ac6c84a3930571e1c9691f4bd7e6b46b.tar.gz
Essentials-94774a32ac6c84a3930571e1c9691f4bd7e6b46b.tar.lz
Essentials-94774a32ac6c84a3930571e1c9691f4bd7e6b46b.tar.xz
Essentials-94774a32ac6c84a3930571e1c9691f4bd7e6b46b.zip
[trunk] add new config setting warn-on-smite: true setting this to false will not tell people they are smited when using /lightning
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1289 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandlightning.java3
-rw-r--r--Essentials/src/config.yml3
3 files changed, 11 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 835afa54f..fb6fc5189 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -473,4 +473,9 @@ public class Settings implements IConf
{
return config.getBoolean("debug", false);
}
+
+ public boolean warnOnSmite()
+ {
+ return config.getBoolean("warn-on-smite" ,true);
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
index c77d430c0..7231b5130 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlightning.java
@@ -37,7 +37,10 @@ public class Commandlightning extends EssentialsCommand
user.sendMessage("§7Smiting " + p.getDisplayName());
world.strikeLightning(p.getLocation());
p.setHealth(p.getHealth() < 5 ? 0 : p.getHealth() -5);
+ if(Essentials.getSettings().warnOnSmite())
+ {
p.sendMessage("§7You have just been smited");
+ }
}
user.charge(this);
}
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 9b8264f20..7d3c7a17f 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -70,6 +70,9 @@ nether:
# Mob limit on spawnmob
spawnmob-limit: 10
+#Shall we notify users when using /lightning
+warn-on-smite: true
+
# The message of the day, displayed on connect and by typing /motd.
motd:
- '&cWelcome, {PLAYER}&c!'