diff options
| author | snowleo <schneeleo@gmail.com> | 2012-02-06 22:13:39 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-02-06 22:13:39 +0100 |
| commit | 539700cb215e088546e5d7f7bba4e1035466626e (patch) | |
| tree | 2a9b5d3a0a069a01306a68de40419b843bac8467 /EssentialsSpawn | |
| parent | 1078b7b5f28597b28232519621b8d540aaebef4e (diff) | |
| download | Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar.gz Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar.lz Essentials-539700cb215e088546e5d7f7bba4e1035466626e.tar.xz Essentials-539700cb215e088546e5d7f7bba4e1035466626e.zip | |
New Groups code, supports groups.yml file, gm and vault, new economy api.
Diffstat (limited to 'EssentialsSpawn')
3 files changed, 3 insertions, 3 deletions
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java index 357b03a2c..b817c854a 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/Commandspawn.java @@ -50,7 +50,7 @@ public class Commandspawn extends EssentialsCommand private void respawn(final IUser user, final Trade charge) throws Exception { final SpawnStorage spawns = (SpawnStorage)this.module; - final Location spawn = spawns.getSpawn(user.getGroup()); + final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user)); user.getTeleport().teleport(spawn, charge, TeleportCause.COMMAND); } } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index bab6bd822..5dd913ee7 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -60,7 +60,7 @@ public class EssentialsSpawnPlayerListener implements Listener return; } } - final Location spawn = spawns.getSpawn(user.getGroup()); + final Location spawn = spawns.getSpawn(ess.getGroups().getMainGroup(user)); if (spawn != null) { event.setRespawnLocation(spawn); diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java index 98545eaf0..6171ed7ac 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/SpawnStorage.java @@ -154,7 +154,7 @@ public class SpawnStorage extends AsyncStorageObjectHolder<Spawns> implements IE acquireReadLock(); try { - return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", user.getGroup()).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString()); + return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getDisplayName()).replace("{DISPLAYNAME}", user.getDisplayName()).replace("{GROUP}", ess.getGroups().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getAddress().toString()); } finally { |