Merge branch 'master' into seven

2011-10-23 17:31:30 +02:00
parent d280f9409d 83f690c9c5
commit e6ff84ad9a
9 changed files with 122 additions and 70 deletions
--- a/src/com/massivecraft/factions/FPlayer.java
+++ b/src/com/massivecraft/factions/FPlayer.java
@@ -770,6 +770,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 		}
 		
 		Board.setFactionAt(forFaction, flocation);
+		SpoutFeatures.updateTerritoryDisplayLoc(flocation);
 		return true;
 	}