minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-17 20:11:21 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0' of github.com:essentials/Essentials into 3.0

Browse Source 
Conflicts:
	Essentials/src/messages_en.properties
This commit is contained in:
KHobbits
2012-01-24 22:56:53 +00:00
parent bdc695c85b 307c6c7bf0
commit 38a9327284
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
View File

@@ -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) public EssentialsLocalChatEvent(final Player player, final String message, final String format, final long radius)
{ {
super("EssLocalChat");
this.player = player; this.player = player;
this.message = message; this.message = message;
this.format = format; this.format = format;

1
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
View File

@@ -7,7 +7,6 @@ import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;

6
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@@ -7,6 +7,7 @@ import com.earth2me.essentials.api.IUser;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.event.player.PlayerRespawnEvent;
@@ -93,6 +94,11 @@ public class EssentialsSpawnPlayerListener implements Listener
@Override @Override
public void run() public void run()
{ {
if (user.getBase() instanceof OfflinePlayer)
{
return;
}
try try
{ {
final Location spawn = spawns.getNewbieSpawn(); final Location spawn = spawns.getNewbieSpawn();