minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 12:31:26 +02:00
Code Issues Releases Wiki Activity

remove merge leftovers

Browse Source 
Don't try to spawn users who have disconnected before we have a chance to spawn them
This commit is contained in:
ementalo
2012-01-24 22:50:34 +00:00
parent cc0e9aa84b
commit 307c6c7bf0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/messages_en.properties
View File

@@ -293,11 +293,7 @@ requestDenied=\u00a77Teleport request denied.
requestDeniedFrom=\u00a77{0} denied your teleport request. requestDeniedFrom=\u00a77{0} denied your teleport request.
requestSent=\u00a77Request sent to {0}\u00a77. requestSent=\u00a77Request sent to {0}\u00a77.
requestTimedOut=\u00a7cTeleport request has timed out requestTimedOut=\u00a7cTeleport request has timed out
<<<<<<< HEAD
requiredBukkit= * ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
=======
requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org. requiredBukkit=* ! * You need atleast build {0} of CraftBukkit, download it from http://ci.bukkit.org.
>>>>>>> refs/heads/master
returnPlayerToJailError=Error occurred when trying to return player to jail. returnPlayerToJailError=Error occurred when trying to return player to jail.
second=second second=second
seconds=seconds seconds=seconds

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();