From: Kimmo R. <ki...@us...> - 2012-09-02 14:25:33
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/actions In directory vz-cvs-4.sog:/tmp/cvs-serv3085/src/games/stendhal/server/actions Modified Files: UseAction.java Log Message: Cope with entities not found Index: UseAction.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/actions/UseAction.java,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** UseAction.java 2 Sep 2012 13:53:13 -0000 1.58 --- UseAction.java 2 Sep 2012 14:25:31 -0000 1.59 *************** *** 62,70 **** private void useEntityFromPath(Player player, RPAction action) { Entity entity = EntityHelper.getEntityFromPath(player, action.getList(TARGET_PATH)); ! ! if (entity.isContained() && !mayAccessContainedEntity(player, entity)) { ! return; } - tryUse(player, entity); } --- 62,71 ---- private void useEntityFromPath(Player player, RPAction action) { Entity entity = EntityHelper.getEntityFromPath(player, action.getList(TARGET_PATH)); ! if (entity != null) { ! if (entity.isContained() && !mayAccessContainedEntity(player, entity)) { ! return; ! } ! tryUse(player, entity); } } |