diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java b/trunk/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java
index 84854fafc5..cfa79b1bd1 100644
--- a/trunk/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java
+++ b/trunk/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java
@@ -64,7 +64,9 @@ public class FortressFlagpole implements ITargetTypeHandler
 				case 36285:
 				case 36316:
 				case 36354:
+				{
 					return target;
+				}
 			}
 		}
 		
diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Item.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Item.java
index 2fb9859091..6080910ea0 100644
--- a/trunk/dist/game/data/scripts/handlers/targethandlers/Item.java
+++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Item.java
@@ -39,5 +39,4 @@ public class Item implements ITargetTypeHandler
 	{
 		return null;
 	}
-	
 }
diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/NpcBody.java b/trunk/dist/game/data/scripts/handlers/targethandlers/NpcBody.java
index 5cce645136..68f1d4dfda 100644
--- a/trunk/dist/game/data/scripts/handlers/targethandlers/NpcBody.java
+++ b/trunk/dist/game/data/scripts/handlers/targethandlers/NpcBody.java
@@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.GeoData;
 import com.l2jmobius.gameserver.handler.ITargetTypeHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Character;
-import com.l2jmobius.gameserver.model.actor.L2Playable;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.model.skills.targets.TargetType;
 import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -61,7 +60,7 @@ public class NpcBody implements ITargetTypeHandler
 			return null;
 		}
 		
-		final L2Playable target = (L2Playable) selectedTarget;
+		final L2Character target = (L2Character) selectedTarget;
 		
 		if (target.isDead())
 		{
@@ -90,7 +89,7 @@ public class NpcBody implements ITargetTypeHandler
 				return null;
 			}
 			
-			return target;
+			return selectedTarget;
 		}
 		
 		// If target is not dead or not player/pet it will not even bother to walk within range, unlike Enemy target type.
diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Others.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Others.java
index b160ab0157..cf3a586683 100644
--- a/trunk/dist/game/data/scripts/handlers/targethandlers/Others.java
+++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Others.java
@@ -39,5 +39,4 @@ public class Others implements ITargetTypeHandler
 	{
 		return null;
 	}
-	
 }
diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Self.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Self.java
index ba6c6ebb8a..4f480c35af 100644
--- a/trunk/dist/game/data/scripts/handlers/targethandlers/Self.java
+++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Self.java
@@ -50,5 +50,4 @@ public class Self implements ITargetTypeHandler
 		}
 		return activeChar;
 	}
-	
 }
diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/WyvernTarget.java b/trunk/dist/game/data/scripts/handlers/targethandlers/WyvernTarget.java
index 596460e976..111693fdd8 100644
--- a/trunk/dist/game/data/scripts/handlers/targethandlers/WyvernTarget.java
+++ b/trunk/dist/game/data/scripts/handlers/targethandlers/WyvernTarget.java
@@ -39,5 +39,4 @@ public class WyvernTarget implements ITargetTypeHandler
 	{
 		return null;
 	}
-	
 }
diff --git a/trunk/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/trunk/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java
index 191e500d4a..1797581063 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java
@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
  */
 public enum CommonSkill
 {
+	SWEEPER(42, 1),
 	RAID_CURSE(4215, 1),
 	RAID_CURSE2(4515, 1),
 	SEAL_OF_RULER(246, 1),
diff --git a/trunk/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/trunk/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
index 4971075eda..1c529e7c05 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -206,7 +206,6 @@ public class SkillCaster implements Runnable
 			// Stop casting if there is no next phase.
 			stopCasting(false);
 		}
-		
 	}
 	
 	public boolean startCasting()
@@ -545,8 +544,12 @@ public class SkillCaster implements Runnable
 					}
 					else if (obj.isMonster() || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) || (obj.getActingPlayer().getReputation() < 0))))
 					{
-						// Supporting players or monsters result in pvpflag.
-						player.updatePvPStatus();
+						// Supporting players or monsters result in pvpflag,
+						// but Sweeper is excluded.
+						if (obj.isMonster() && (skill.getId() != CommonSkill.SWEEPER.getId()))
+						{
+							player.updatePvPStatus();
+						}
 					}
 				}