Solo event status related additions.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -80,7 +80,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -80,7 +80,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -80,7 +80,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -80,7 +80,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad()&& !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -399,6 +399,7 @@ public class PlayerInstance extends Playable
 	private final int[] _race = new int[2];
 	private final BlockList _blockList = new BlockList(this);
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	private int _team = 0;
 	private int _alliedVarkaKetra = 0;
@@ -8943,7 +8944,7 @@ public class PlayerInstance extends Playable
 			final PlayerInstance player = attacker.getActingPlayer();
 			if ((player != null) && player.isOnEvent())
 			{
-				return getTeam() != player.getTeam();
+				return isOnSoloEvent() || (getTeam() != player.getTeam());
 			}
 		}
 		
@@ -9696,7 +9697,7 @@ public class PlayerInstance extends Playable
 		// Check if player and target are in events and on the same team.
 		if ((target instanceof PlayerInstance) && isOnEvent() && skill.isOffensive())
 		{
-			return target.getActingPlayer().isOnEvent() && (getTeam() != target.getActingPlayer().getTeam());
+			return target.getActingPlayer().isOnEvent() && (isOnSoloEvent() || (getTeam() != target.getActingPlayer().getTeam()));
 		}
 		
 		// check for PC->PC Pvp status
@@ -11002,6 +11003,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	/**
 	 * Sets the team.
 	 * @param team the new team

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java

@@ -98,7 +98,7 @@ public class AttackRequest implements IClientIncomingPacket
 		}
 		
 		// No attacks to same team in event
-		if (player.isOnEvent())
+		if (player.isOnEvent() && !player.isOnSoloEvent())
 		{
 			if (target instanceof PlayerInstance)
 			{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -412,6 +412,7 @@ public class PlayerInstance extends Playable
 	private final int[] _race = new int[2];
 	private final BlockList _blockList = new BlockList(this);
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	private int _team = 0;
 	private int _alliedVarkaKetra = 0;
@@ -9095,7 +9096,7 @@ public class PlayerInstance extends Playable
 			final PlayerInstance player = attacker.getActingPlayer();
 			if ((player != null) && player.isOnEvent())
 			{
-				return getTeam() != player.getTeam();
+				return isOnSoloEvent() || (getTeam() != player.getTeam());
 			}
 		}
 		
@@ -9862,7 +9863,7 @@ public class PlayerInstance extends Playable
 		// Check if player and target are in events and on the same team.
 		if ((target instanceof PlayerInstance) && isOnEvent() && skill.isOffensive())
 		{
-			return target.getActingPlayer().isOnEvent() && (getTeam() != target.getActingPlayer().getTeam());
+			return target.getActingPlayer().isOnEvent() && (isOnSoloEvent() || (getTeam() != target.getActingPlayer().getTeam()));
 		}
 		
 		// check for PC->PC Pvp status
@@ -11297,6 +11298,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	/**
 	 * Sets the team.
 	 * @param team the new team

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/AttackRequest.java

@@ -98,7 +98,7 @@ public class AttackRequest implements IClientIncomingPacket
 		}
 		
 		// No attacks to same team in event
-		if (player.isOnEvent())
+		if (player.isOnEvent() && !player.isOnSoloEvent())
 		{
 			if (target instanceof PlayerInstance)
 			{

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java

@@ -87,7 +87,7 @@ public class CorpseClan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
+					if (player.isOnEvent() && !player.isOnSoloEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
 					{
 						continue;
 					}

L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/PartyClan.java

@@ -117,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
 			{
 				continue;
 			}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java

@@ -291,7 +291,7 @@ public class CubicInstance implements IIdentifiable
 				if (ownerTarget.getActingPlayer() != null)
 				{
 					final PlayerInstance target = ownerTarget.getActingPlayer();
-					if ((_owner.getTeam() != target.getTeam()) && !(target.isDead()))
+					if (((_owner.getTeam() != target.getTeam()) || _owner.isOnSoloEvent()) && !(target.isDead()))
 					{
 						_target = (Creature) ownerTarget;
 					}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -717,6 +717,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8422,7 +8423,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -14015,6 +14016,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public void setBlockCheckerArena(byte arena)
 	{
 		_handysBlockCheckerEventArena = arena;

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java

@@ -1122,7 +1122,7 @@ public class Skill implements IIdentifiable
 					}
 				}
 				
-				if (player.isOnEvent() && targetPlayer.isOnEvent() && (player.getTeam() == target.getTeam()))
+				if (player.isOnEvent() && !player.isOnSoloEvent() && targetPlayer.isOnEvent() && (player.getTeam() == target.getTeam()))
 				{
 					return false;
 				}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/CorpseClan.java

@@ -87,7 +87,7 @@ public class CorpseClan implements ITargetTypeHandler
 						continue;
 					}
 					
-					if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
+					if (player.isOnEvent() && !player.isOnSoloEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
 					{
 						continue;
 					}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/PartyClan.java

@@ -117,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler
 				continue;
 			}
 			
-			if (player.isOnEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && obj.isOnEvent() && (player.getTeam() != obj.getTeam()))
 			{
 				continue;
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java

@@ -291,7 +291,7 @@ public class CubicInstance implements IIdentifiable
 				if (ownerTarget.getActingPlayer() != null)
 				{
 					final PlayerInstance target = ownerTarget.getActingPlayer();
-					if ((_owner.getTeam() != target.getTeam()) && !(target.isDead()))
+					if (((_owner.getTeam() != target.getTeam()) || _owner.isOnSoloEvent()) && !(target.isDead()))
 					{
 						_target = (Creature) ownerTarget;
 					}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -736,6 +736,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8306,7 +8307,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -14102,6 +14103,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public void setBlockCheckerArena(byte arena)
 	{
 		_handysBlockCheckerEventArena = arena;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/skills/Skill.java

@@ -1129,7 +1129,7 @@ public class Skill implements IIdentifiable
 					}
 				}
 				
-				if (player.isOnEvent() && targetPlayer.isOnEvent() && (player.getTeam() == target.getTeam()))
+				if (player.isOnEvent() && !player.isOnSoloEvent() && targetPlayer.isOnEvent() && (player.getTeam() == target.getTeam()))
 				{
 					return false;
 				}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -718,6 +718,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8101,7 +8102,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -13028,6 +13029,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public boolean isBlockedFromDeathPenalty()
 	{
 		return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -718,6 +718,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8101,7 +8102,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -13028,6 +13029,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public boolean isBlockedFromDeathPenalty()
 	{
 		return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1022,7 +1022,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -716,6 +716,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8087,7 +8088,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -13014,6 +13015,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public boolean isBlockedFromDeathPenalty()
 	{
 		return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1023,7 +1023,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -724,6 +724,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8114,7 +8115,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -13062,6 +13063,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public boolean isBlockedFromDeathPenalty()
 	{
 		return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1023,7 +1023,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -724,6 +724,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8114,7 +8115,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -13062,6 +13063,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public boolean isBlockedFromDeathPenalty()
 	{
 		return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1130,7 +1130,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java

@@ -79,7 +79,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java

@@ -79,7 +79,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Events.
-			if (player.isOnEvent() && (player.getTeam() == target.getTeam()))
+			if (player.isOnEvent() && !player.isOnSoloEvent() && (player.getTeam() == target.getTeam()))
 			{
 				return false;
 			}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1023,7 +1023,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				// Events.
-				else if (getActingPlayer().isOnEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
+				else if (getActingPlayer().isOnEvent() && !getActingPlayer().isOnSoloEvent() && target.isPlayable() && (getActingPlayer().getTeam() == target.getActingPlayer().getTeam()))
 				{
 					sendPacket(ActionFailed.STATIC_PACKET);
 					return;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -738,6 +738,7 @@ public class PlayerInstance extends Playable
 	
 	/** Event parameters */
 	private boolean _isRegisteredOnEvent = false;
+	private boolean _isOnSoloEvent = false;
 	private boolean _isOnEvent = false;
 	
 	private byte _handysBlockCheckerEventArena = -1;
@@ -8067,7 +8068,7 @@ public class PlayerInstance extends Playable
 		// Check if the attacker is in an event
 		if (isOnEvent())
 		{
-			return getTeam() != attacker.getTeam();
+			return isOnSoloEvent() || (getTeam() != attacker.getTeam());
 		}
 		
 		// Check if the attacker is a Playable
@@ -13071,6 +13072,16 @@ public class PlayerInstance extends Playable
 		_isOnEvent = value;
 	}
 	
+	public boolean isOnSoloEvent()
+	{
+		return _isOnSoloEvent;
+	}
+	
+	public void setOnSoloEvent(boolean value)
+	{
+		_isOnSoloEvent = value;
+	}
+	
 	public boolean isBlockedFromDeathPenalty()
 	{
 		return _isOnEvent || isAffected(EffectFlag.PROTECT_DEATH_PENALTY);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java

@@ -64,7 +64,7 @@ public class ConditionPlayerCanTransform extends Condition
 			player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
 			canTransform = false;
 		}
-		else if (player.isOnEvent())
+		else if (player.isRegisteredOnEvent())
 		{
 			player.sendMessage("You cannot transform while registered on an event.");
 			canTransform = false;

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java

@@ -1135,7 +1135,7 @@ public class SkillCaster implements Runnable
 					return false;
 				}
 				
-				if (skill.isBad())
+				if (skill.isBad() && !player.isOnSoloEvent())
 				{
 					final WorldObject target = player.getTarget();
 					if ((target != null) && target.isPlayable() && (player.getTeam() == target.getActingPlayer().getTeam()))