Fix merge error

This commit is contained in:
snowleo 2011-07-16 01:35:30 +02:00
parent 3c28dabfad
commit ad8ad8b574

View file

@ -31,13 +31,14 @@ public class OfflinePlayer implements Player
private final String name; private final String name;
final transient IEssentials ess; final transient IEssentials ess;
private Location location = new Location(null, 0, 0, 0, 0, 0); private Location location = new Location(null, 0, 0, 0, 0, 0);
private World world = ess.getServer().getWorlds().get(0); private World world;
private UUID uniqueId = UUID.randomUUID(); private UUID uniqueId = UUID.randomUUID();
public OfflinePlayer(String name, IEssentials ess) public OfflinePlayer(String name, IEssentials ess)
{ {
this.name = name; this.name = name;
this.ess = ess; this.ess = ess;
this.world = ess.getServer().getWorlds().get(0);
} }
public boolean isOnline() public boolean isOnline()