[Jake2-commits] jake2/src/jake2/game GameItems.java,1.2,1.3

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14510/src/jake2/game

Modified Files:
	GameItems.java 
Log Message:
npe fix in Touch_Items

Index: GameItems.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/game/GameItems.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GameItems.java	20 Nov 2005 22:18:33 -0000	1.2
--- GameItems.java	17 Dec 2005 20:32:29 -0000	1.3
***************
*** 1291,1296 ****
              csurface_t surf) {
          boolean taken;
!     
!         if (other.client == null)
              return;
          if (other.health < 1)
--- 1291,1297 ----
              csurface_t surf) {
          boolean taken;
! 
!         // freed edicts have not items.
!         if (other.client == null || ent.item == null)
              return;
          if (other.health < 1)