From: Kimmo R. <ki...@us...> - 2010-03-25 15:33:36
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25126/src/games/stendhal/server/maps/quests Modified Files: MeetBunny.java Log Message: Do not add bunny to npc list until initialization has been succesfully done. Fixes repeating NPEs in SpeakerNPC.preLogic when server is started with stendhal.zone.regex Index: MeetBunny.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/quests/MeetBunny.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** MeetBunny.java 23 Mar 2010 20:59:03 -0000 1.32 --- MeetBunny.java 25 Mar 2010 15:33:26 -0000 1.33 *************** *** 82,86 **** } }; ! npcs.add(bunny); bunny.setEntityClass("easterbunnynpc"); bunny.initHP(100); --- 82,86 ---- } }; ! bunny.setEntityClass("easterbunnynpc"); bunny.initHP(100); *************** *** 92,95 **** --- 92,97 ---- bunny.setPosition(17, 13); zone.add(bunny); + // Do not add bunny to NPC list until all is known to be OK + npcs.add(bunny); return bunny; |