diff options
| author | snowleo <schneeleo@gmail.com> | 2012-02-21 18:34:53 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-02-21 18:34:53 +0100 |
| commit | 4da3f52164f118825ace616408b4ce13571cab63 (patch) | |
| tree | 05b19c7261df84eaa8a6bda460af562bd72eb484 /EssentialsProtect | |
| parent | cae3c5a03e2a3306c09132e277b2ea010ec8385b (diff) | |
| parent | cf7da7a83fef4d7734ed1ed5b672f2e07749b679 (diff) | |
| download | Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.gz Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.lz Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.xz Essentials-4da3f52164f118825ace616408b4ce13571cab63.zip | |
Merge branch 'refs/heads/master' into 3.0
Conflicts:
.gitignore
Essentials/src/com/earth2me/essentials/Essentials.java
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
Essentials/src/com/earth2me/essentials/ISettings.java
Essentials/src/com/earth2me/essentials/Jails.java
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
Essentials/src/com/earth2me/essentials/Settings.java
Essentials/src/com/earth2me/essentials/User.java
Essentials/src/com/earth2me/essentials/UserData.java
Essentials/src/com/earth2me/essentials/UserMap.java
Essentials/src/com/earth2me/essentials/Util.java
Essentials/src/com/earth2me/essentials/commands/Commandnear.java
Essentials/src/com/earth2me/essentials/commands/Commandping.java
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
Essentials/src/messages_en.properties
Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
EssentialsChat/src/plugin.yml
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
Diffstat (limited to 'EssentialsProtect')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java | 1 | ||||
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java index 4f392e141..72000eeba 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java @@ -63,6 +63,7 @@ public class EssentialsProtect extends JavaPlugin implements IProtect { final EmergencyListener emListener = new EmergencyListener(); pm.registerEvents(emListener, this); + for (Player player : getServer().getOnlinePlayers()) { player.sendMessage("Essentials Protect is in emergency mode. Check your log for errors."); diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index d99497f15..9a754a374 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -322,7 +322,7 @@ public class EssentialsProtectEntityListener implements Listener } @EventHandler(priority = EventPriority.HIGHEST) - public void onEndermanPickup(final EndermanPickupEvent event) + public void onEntityChangeBlock(final EntityChangeBlockEvent event) { if (event.isCancelled()) { |