Upstream/Factions
1
0
Fork 0
mirror of https://github.com/MassiveCraft/Factions.git synced 2024-11-19 16:55:21 +01:00
Code Issues Projects Releases Wiki Activity

fix for Spout faction labels not updating for players who have /f map on

Browse Source
This commit is contained in:
Brettflan 2011-12-16 00:31:23 -06:00
parent 8ec0173eae
commit e66e71f36b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -175,6 +175,11 @@ public class FactionsPlayerListener extends PlayerListener
@Override
public void onPlayerMove(PlayerMoveEvent event)
{
// Did we change block?
if (event.getFrom().equals(event.getTo())
|| (event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockZ() == event.getTo().getBlockZ())
) return;
Player player = event.getPlayer();
FPlayer me = FPlayers.i.get(player);
@ -190,21 +195,29 @@ public class FactionsPlayerListener extends PlayerListener
// Yes we did change coord (:
me.setLastStoodAt(to);
// Did we change "host"(faction)?
boolean spoutClient = SpoutFeatures.availableFor(player);
Faction factionFrom = Board.getFactionAt(from);
Faction factionTo = Board.getFactionAt(to);
boolean changedFaction = (factionFrom != factionTo);
if (changedFaction && SpoutFeatures.updateTerritoryDisplay(me))
changedFaction = false;
if (me.isMapAutoUpdating())
{
me.sendMessage(Board.getMap(me.getFaction(), to, player.getLocation().getYaw()));
if (spoutClient && Conf.spoutTerritoryOwnersShow)
SpoutFeatures.updateOwnerList(me);
}
else
{
// Did we change "host"(faction)?
Faction factionFrom = Board.getFactionAt(from);
Faction factionTo = Board.getFactionAt(to);
Faction myFaction = me.getFaction();
String ownersTo = myFaction.getOwnerListString(to);
boolean spoutClient = SpoutFeatures.availableFor(player);
if (factionFrom != factionTo)
if (changedFaction)
{
me.sendFactionHereMessage();
if