[Arianne-commits] stendhal/src/games/stendhal/server/entity/item/scroll MapScroll.java, 1.7, 1.8 Scroll.java, 1.6, 1.7

[Astrid S. <ast...@us...>]

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

Modified Files:
	MapScroll.java Scroll.java 
Log Message:
changed seerver.activeEntity.applyMovement, regarding order of collision detection and rection on it.
changed Inferface Uselistener to boolean onUsed .

Index: Scroll.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/scroll/Scroll.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Scroll.java	3 Jul 2007 17:59:13 -0000	1.6
--- Scroll.java	23 Jul 2007 11:38:56 -0000	1.7
***************
*** 66,70 ****
  	}
  
! 	public void onUsed(RPEntity user) {
  		RPObject base = this;
  
--- 66,70 ----
  	}
  
! 	public boolean onUsed(RPEntity user) {
  		RPObject base = this;
  
***************
*** 79,84 ****
--- 79,86 ----
  				user.notifyWorldAboutChanges();
  			}
+ 			return true;
  		} else {
  			logger.debug("Scroll is too far away");
+ 			return false;
  		}
  	}

Index: MapScroll.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/item/scroll/MapScroll.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MapScroll.java	3 Jul 2007 17:59:13 -0000	1.7
--- MapScroll.java	23 Jul 2007 11:38:56 -0000	1.8
***************
*** 44,49 ****
  
  	@Override
! 	public void onUsed(RPEntity user) {
  		// maps are scrolls without any special actions
  	}
  }
--- 44,50 ----
  
  	@Override
! 	public boolean onUsed(RPEntity user) {
  		// maps are scrolls without any special actions
+ 		return true;
  	}
  }