Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22 from oliverw92/master

Browse Source 
Made Faction Homes Obey Worlds
This commit is contained in:
Brett Flannigan 2011-06-29 23:43:39 -07:00
commit 2f61e83a8a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/mcteam/factions/listeners/FactionsPlayerListener.java
View File

@ -334,7 +334,7 @@ public class FactionsPlayerListener extends PlayerListener{
public void onPlayerRespawn(PlayerRespawnEvent event) { public void onPlayerRespawn(PlayerRespawnEvent event) {
FPlayer me = FPlayer.get(event.getPlayer()); FPlayer me = FPlayer.get(event.getPlayer());
Location home = me.getFaction().getHome(); Location home = me.getFaction().getHome();
if (Conf.homesEnabled && Conf.homesTeleportToOnDeath && home != null) { if (Conf.homesEnabled && Conf.homesTeleportToOnDeath && home != null && !Conf.worldsNoPowerLoss.contains(event.getPlayer().getWorld().getName())) {
event.setRespawnLocation(home); event.setRespawnLocation(home);
} }
} }