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

Should finally completely fix problem where player location world changes in the middle of the /f home smoke effect, triggering an error from trying to calculate distance between worlds

Browse Source 
also updated Spout API lib
This commit is contained in:
Brettflan 2012-03-19 01:28:06 -05:00
parent 345e18bf56
commit f3239cd9ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/SpoutAPI.jar
View File

Binary file not shown.

6
src/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -76,6 +76,7 @@ public class CmdHome extends FCommand
} }
Faction faction = Board.getFactionAt(new FLocation(me.getLocation())); Faction faction = Board.getFactionAt(new FLocation(me.getLocation()));
Location loc = me.getLocation().clone();
// if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby // if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby
if if
@ -95,7 +96,6 @@ public class CmdHome extends FCommand
) )
) )
{ {
Location loc = me.getLocation();
World w = loc.getWorld(); World w = loc.getWorld();
double x = loc.getX(); double x = loc.getX();
double y = loc.getY(); double y = loc.getY();
@ -135,8 +135,8 @@ public class CmdHome extends FCommand
if (Conf.homesTeleportCommandSmokeEffectEnabled) if (Conf.homesTeleportCommandSmokeEffectEnabled)
{ {
List<Location> smokeLocations = new ArrayList<Location>(); List<Location> smokeLocations = new ArrayList<Location>();
smokeLocations.add(me.getLocation()); smokeLocations.add(loc);
smokeLocations.add(me.getLocation().clone().add(0, 1, 0)); smokeLocations.add(loc.add(0, 1, 0));
smokeLocations.add(myFaction.getHome()); smokeLocations.add(myFaction.getHome());
smokeLocations.add(myFaction.getHome().clone().add(0, 1, 0)); smokeLocations.add(myFaction.getHome().clone().add(0, 1, 0));
SmokeUtil.spawnCloudRandom(smokeLocations, 3f); SmokeUtil.spawnCloudRandom(smokeLocations, 3f);