From: Katie R. <ky...@us...> - 2010-08-07 18:51:34
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2d/entity In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv26112/src/games/stendhal/client/gui/j2d/entity Modified Files: Pet2DView.java Log Message: re-add missing ! for the !user.hasPet() which fixes NPEs when right clicking a pet Index: Pet2DView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2d/entity/Pet2DView.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Pet2DView.java 1 Aug 2010 13:11:28 -0000 1.17 --- Pet2DView.java 7 Aug 2010 18:51:21 -0000 1.18 *************** *** 56,60 **** User user = User.get(); Pet pet = (Pet) entity; ! if ((user != null) && user.hasPet()) { list.add(ActionType.OWN.getRepresentation()); } else if ((pet != null) && (user.getPetID() == pet.getID().getObjectID())) { --- 56,60 ---- User user = User.get(); Pet pet = (Pet) entity; ! if ((user != null) && !user.hasPet()) { list.add(ActionType.OWN.getRepresentation()); } else if ((pet != null) && (user.getPetID() == pet.getID().getObjectID())) { |