--- trunk/gameserver/head-src/com/l2jfrozen/gameserver/model/actor/instance/L2ObservationInstance.java (revision 59)
+++ trunk/gameserver/head-src/com/l2jfrozen/gameserver/model/actor/instance/L2ObservationInstance.java (revision 651)
@@ -21,6 +21,7 @@
 import java.util.StringTokenizer;
 
 import com.l2jfrozen.gameserver.managers.SiegeManager;
+import com.l2jfrozen.gameserver.model.entity.olympiad.Olympiad;
 import com.l2jfrozen.gameserver.network.SystemMessageId;
 import com.l2jfrozen.gameserver.network.serverpackets.ActionFailed;
 import com.l2jfrozen.gameserver.network.serverpackets.ItemList;
@@ -52,6 +53,24 @@
 			StringTokenizer st = new StringTokenizer(val);
 			st.nextToken(); // Bypass cost
 
+			if(Olympiad.getInstance().isRegistered(player) || player.isInOlympiadMode())
+			{
+				player.sendMessage("You already participated in Olympiad!"); 
+				return;
+			}
+			
+			if(player._inEventTvT || player._inEventDM || player._inEventCTF)
+			{
+				player.sendMessage("You already participated in Event!");
+				return;
+			}
+			
+			if(player.isInCombat() || player.getPvpFlag() > 0)
+			{
+				player.sendMessage("You are in combat now!");
+				return;
+			}
+			
 			if(SiegeManager.getInstance().getSiege(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken())) != null)
 			{
 				doObserve(player, val);
@@ -66,6 +85,24 @@
 		}
 		else if(command.startsWith("observe"))
 		{
+			if(Olympiad.getInstance().isRegistered(player) || player.isInOlympiadMode())
+			{
+				player.sendMessage("You already participated in Olympiad!"); 
+				return;
+			}
+			
+			if(player._inEventTvT || player._inEventDM || player._inEventCTF)
+			{
+				player.sendMessage("You already participated in Event!");
+				return;
+			}
+			
+			if(player.isInCombat() || player.getPvpFlag() > 0)
+			{
+				player.sendMessage("You are in combat now!");
+				return;
+			}
+			
 			doObserve(player, command.substring(8));
 		}
 		else