From: Kimmo R. <ki...@us...> - 2010-12-31 10:17:40
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/script In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24835/src/games/stendhal/server/script Modified Files: ResetSlot.java Log Message: Check that the player and slot are valid. Fixes [3148566] "[Stendhal] NPE in ResetSlot" Index: ResetSlot.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/script/ResetSlot.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ResetSlot.java 19 Sep 2010 02:36:26 -0000 1.2 --- ResetSlot.java 31 Dec 2010 10:17:31 -0000 1.3 *************** *** 41,45 **** --- 41,53 ---- // find the player and slot final Player player = SingletonRepository.getRuleProcessor().getPlayer(args.get(0)); + if (player == null) { + admin.sendPrivateText("No such player: " + args.get(0)); + return; + } final RPSlot slot = player.getSlot(args.get(1)); + if (slot == null) { + admin.sendPrivateText("No such slot: " + args.get(1)); + return; + } // remove old store object |