From: Daniel H. <wik...@us...> - 2007-03-18 23:55:56
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6738/src/games/stendhal/server Modified Files: Jail.java Log Message: give admin and criminal feedback when sending to jail give criminal feedback when released made it possible to give a reason longer than one word Index: Jail.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/Jail.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Jail.java 16 Mar 2007 22:26:28 -0000 1.13 --- Jail.java 16 Mar 2007 23:19:04 -0000 1.14 *************** *** 68,72 **** * @param minutes The duration of the sentence */ ! public void imprison(String criminalName, Player policeman, int minutes) { StendhalRPWorld world = StendhalRPWorld.get(); Player criminal = StendhalRPRuleProcessor.get().getPlayer(criminalName); --- 68,72 ---- * @param minutes The duration of the sentence */ ! public void imprison(String criminalName, Player policeman, int minutes, String reason) { StendhalRPWorld world = StendhalRPWorld.get(); Player criminal = StendhalRPRuleProcessor.get().getPlayer(criminalName); *************** *** 92,99 **** while (!successful) { // repeat until we find a free cell ! int cellNumber = Rand.rand(cellEntryPoints.size()); ! Point cell = cellEntryPoints.get(cellNumber); successful = criminal.teleport(jail, cell.x, cell.y, Direction.DOWN, policeman); } // Set a timer so that the inmate is automatically released after --- 92,100 ---- while (!successful) { // repeat until we find a free cell ! Point cell = Rand.rand(cellEntryPoints); successful = criminal.teleport(jail, cell.x, cell.y, Direction.DOWN, policeman); } + policeman.sendPrivateText("You have jailed " + criminal.getName() + " for " + minutes + " minutes. Reason: " + reason + "."); + criminal.sendPrivateText("You have been jailed by " + policeman.getName() + ". Reason: " + reason + "."); // Set a timer so that the inmate is automatically released after *************** *** 134,137 **** --- 135,139 ---- inmate.teleport(semosCity, 30, 40, Direction.UP, null); + inmate.sendPrivateText("Your sentence is over."); logger.debug("Player " + inmateName + "released from jail."); } |