From: Astrid S. <ast...@us...> - 2008-07-09 16:02:25
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/creature/impl In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8935/src/games/stendhal/server/entity/creature/impl Modified Files: RangeAttack.java Log Message: fixing [ 2014110 ] Archers (all type) run into the wall Index: RangeAttack.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/creature/impl/RangeAttack.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RangeAttack.java 13 Apr 2008 09:36:12 -0000 1.4 --- RangeAttack.java 9 Jul 2008 16:02:27 -0000 1.5 *************** *** 40,48 **** creature.faceToward(creature.getAttackTarget()); } else if (distance < 16) { - //TODO: handle collision creature.faceToward(creature.getAttackTarget()); creature.setDirection(creature.getDirection().oppositeDirection()); ! creature.setSpeed(creature.getBaseSpeed()); ! } else { creature.clearPath(); --- 40,51 ---- creature.faceToward(creature.getAttackTarget()); } else if (distance < 16) { creature.faceToward(creature.getAttackTarget()); creature.setDirection(creature.getDirection().oppositeDirection()); ! if (creature.getZone().collides(creature,creature.getX()+creature.getDirection().getdx(),creature.getY()+creature.getDirection().getdy(),true)) { ! creature.faceToward(creature.getAttackTarget()); ! creature.setSpeed(0); ! } else { ! creature.setSpeed(creature.getBaseSpeed()); ! } } else { creature.clearPath(); *************** *** 50,55 **** creature.faceToward(creature.getAttackTarget()); } - - } --- 53,56 ---- |