diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-24 22:56:53 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-24 22:56:53 +0000 |
| commit | 38a932728466a28d773a348f47db59028b5fe8b4 (patch) | |
| tree | f68e03d8421f2ccced735bef3ed188aaf3e5c317 | |
| parent | bdc695c85b97a31694c75716f33566b171a9559f (diff) | |
| parent | 307c6c7bf0465a741034786686806a9b094df4a1 (diff) | |
| download | Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar.gz Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar.lz Essentials-38a932728466a28d773a348f47db59028b5fe8b4.tar.xz Essentials-38a932728466a28d773a348f47db59028b5fe8b4.zip | |
Merge branch '3.0' of github.com:essentials/Essentials into 3.0
Conflicts:
Essentials/src/messages_en.properties
3 files changed, 6 insertions, 2 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java index 04f70aff7..4973841a3 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java @@ -19,7 +19,6 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable public EssentialsLocalChatEvent(final Player player, final String message, final String format, final long radius) { - super("EssLocalChat"); this.player = player; this.message = message; this.format = format; diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java index ef88472cf..14b22f548 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java @@ -7,7 +7,6 @@ import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.World; import org.bukkit.entity.Player; -import org.bukkit.event.Event; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 21bd0d499..de58d86ed 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -7,6 +7,7 @@ import com.earth2me.essentials.api.IUser; import java.util.logging.Level; import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.OfflinePlayer; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; @@ -93,6 +94,11 @@ public class EssentialsSpawnPlayerListener implements Listener @Override public void run() { + if (user.getBase() instanceof OfflinePlayer) + { + return; + } + try { final Location spawn = spawns.getNewbieSpawn(); |