[Arianne-commits] stendhal/src/games/stendhal/server StendhalRPZone.java, 1.180, 1.181 StendhalRPRuleProcessor.java, 1.235, 1.236 GagManager.java, 1.2, 1.3

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15452/src/games/stendhal/server

Modified Files:
	StendhalRPZone.java StendhalRPRuleProcessor.java 
	GagManager.java 
Log Message:
automatic code cleanup (no semantic changes)

Index: GagManager.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/GagManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GagManager.java	3 Jul 2007 17:58:56 -0000	1.2
--- GagManager.java	11 Aug 2007 20:07:56 -0000	1.3
***************
*** 99,104 ****
  	 */
  	public static boolean isGagged(Player player) {
! 		if(player.hasQuest("gag"))
  			return true;
  		return false;
  	}
--- 99,105 ----
  	 */
  	public static boolean isGagged(Player player) {
! 		if(player.hasQuest("gag")) {
  			return true;
+ 		}
  		return false;
  	}
***************
*** 111,116 ****
  	 */
  	private boolean tryExpire(Player player) {
! 		if(!isGagged(player))
  			return true;
  		
  		// allow for an error of 10 seconds
--- 112,118 ----
  	 */
  	private boolean tryExpire(Player player) {
! 		if(!isGagged(player)) {
  			return true;
+ 		}
  		
  		// allow for an error of 10 seconds
***************
*** 124,129 ****
  
  	public void onLoggedIn(Player player) {
! 		if(!isGagged(player))
  			return;
  		
  		if (!tryExpire(player)) {
--- 126,132 ----
  
  	public void onLoggedIn(Player player) {
! 		if(!isGagged(player)) {
  			return;
+ 		}
  		
  		if (!tryExpire(player)) {
***************
*** 160,165 ****
  	 */
  	public long getTimeRemaining(Player criminal) {
! 		if(!isGagged(criminal))
  			return 0L;
  		long expireDate = Long.parseLong(criminal.getQuest("gag"));
  		long timeRemaining = expireDate - System.currentTimeMillis();
--- 163,169 ----
  	 */
  	public long getTimeRemaining(Player criminal) {
! 		if(!isGagged(criminal)) {
  			return 0L;
+ 		}
  		long expireDate = Long.parseLong(criminal.getQuest("gag"));
  		long timeRemaining = expireDate - System.currentTimeMillis();

Index: StendhalRPZone.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPZone.java,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** StendhalRPZone.java	23 Jul 2007 11:38:52 -0000	1.180
--- StendhalRPZone.java	11 Aug 2007 20:07:56 -0000	1.181
***************
*** 763,782 ****
  		 */
  		if(object instanceof PassiveEntityRespawnPoint) {
! 			plantGrowers.remove((PassiveEntityRespawnPoint) object);
  		}
  
  		if (object instanceof Blood) {
! 			bloods.remove((Blood) object);
  		} else if (object instanceof Player) {
! 			players.remove((Player) object);
! 			playersAndFriends.remove((Player) object);
  		} else if (object instanceof AttackableCreature) {
! 			npcs.remove((AttackableCreature) object);
! 			playersAndFriends.remove((AttackableCreature) object);
  		} else if (object instanceof Sheep) {
! 			playersAndFriends.remove((Sheep) object);
! 			npcs.remove((Sheep)object);
  		} else if (object instanceof SheepFood) {
! 			sheepFoods.remove((SheepFood) object);
  		} else if (object instanceof SpeakerNPC) {
  			/*
--- 763,782 ----
  		 */
  		if(object instanceof PassiveEntityRespawnPoint) {
! 			plantGrowers.remove(object);
  		}
  
  		if (object instanceof Blood) {
! 			bloods.remove(object);
  		} else if (object instanceof Player) {
! 			players.remove(object);
! 			playersAndFriends.remove(object);
  		} else if (object instanceof AttackableCreature) {
! 			npcs.remove(object);
! 			playersAndFriends.remove(object);
  		} else if (object instanceof Sheep) {
! 			playersAndFriends.remove(object);
! 			npcs.remove(object);
  		} else if (object instanceof SheepFood) {
! 			sheepFoods.remove(object);
  		} else if (object instanceof SpeakerNPC) {
  			/*
***************
*** 788,794 ****
  			 * zone scoped/managed/dispatched.
  			 */
! 			npcs.remove((SpeakerNPC) object);
  		} else if (object instanceof Portal) {
! 			portals.remove((Portal) object);
  		}
  
--- 788,794 ----
  			 * zone scoped/managed/dispatched.
  			 */
! 			npcs.remove(object);
  		} else if (object instanceof Portal) {
! 			portals.remove(object);
  		}
  

Index: StendhalRPRuleProcessor.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPRuleProcessor.java,v
retrieving revision 1.235
retrieving revision 1.236
diff -C2 -d -r1.235 -r1.236
*** StendhalRPRuleProcessor.java	28 Jul 2007 22:15:44 -0000	1.235
--- StendhalRPRuleProcessor.java	11 Aug 2007 20:07:56 -0000	1.236
***************
*** 161,165 ****
  
  	private void init() {
! 		database = (StendhalPlayerDatabase) StendhalPlayerDatabase.getDatabase();
  		registerActions();
  		instance = this;
--- 161,165 ----
  
  	private void init() {
! 		database = StendhalPlayerDatabase.getDatabase();
  		registerActions();
  		instance = this;