From: Astrid S. <ast...@us...> - 2008-04-12 13:57:11
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/entity In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20537/src/games/stendhal/client/entity Modified Files: ActiveEntity.java Log Message: code format Index: ActiveEntity.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/entity/ActiveEntity.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** ActiveEntity.java 23 Mar 2008 10:14:53 -0000 1.26 --- ActiveEntity.java 12 Apr 2008 12:59:44 -0000 1.27 *************** *** 228,232 **** User user = User.get(); ! if ((user==null || !user.isGhostMode()) && GameObjects.getInstance().collides(this)) { x = oldX; --- 228,232 ---- User user = User.get(); ! if ((user == null || !user.isGhostMode()) && GameObjects.getInstance().collides(this)) { x = oldX; |