[Arianne-commits] stendhal/src/games/stendhal/server/core/rp StendhalRPAction.java, 1.47, 1.48

[Kimmo R. <ki...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/rp
In directory vz-cvs-4.sog:/tmp/cvs-serv25641/src/games/stendhal/server/core/rp

Modified Files:
	StendhalRPAction.java 
Log Message:
Prevent initiating PVP from protected areas. Fixes [3401950] "Attacking from protected area"


Index: StendhalRPAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/rp/StendhalRPAction.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** StendhalRPAction.java	22 Jun 2011 19:18:52 -0000	1.47
--- StendhalRPAction.java	2 Sep 2011 10:37:26 -0000	1.48
***************
*** 96,103 ****
  
  			// Make sure that you can't attack players or sheep (even wild
! 			// sheep) who are inside a protection area.
! 			if (zone.isInProtectionArea(victim)) {
  				logger.info("REJECTED. " + victim.getName()
! 						+ " is in a protection zone");
  
  				final String name = getNiceVictimName(victim);
--- 96,104 ----
  
  			// Make sure that you can't attack players or sheep (even wild
! 			// sheep) who are inside a protection area. Also prevent attacking
! 			// from such an area, in name of fairness
! 			if (zone.isInProtectionArea(victim) || (zone.isInProtectionArea(player))) {
  				logger.info("REJECTED. " + victim.getName()
! 						+ " is protected by zone");
  
  				final String name = getNiceVictimName(victim);