From 91adae17e94830cdeaa3ac7d224abfa72a6a5e77 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Thu, 28 Mar 2013 16:47:33 +0000
Subject: [PATCH] BETA: DP-Part for [L5916]
---
.../scripts/handlers/admincommandhandlers/AdminTvTEvent.java | 2 +-
.../scripts/handlers/bypasshandlers/OlympiadObservation.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
index ecd5269be0..bde3801275 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTvTEvent.java
@@ -81,7 +81,7 @@ public class AdminTvTEvent implements IAdminCommandHandler
private void add(L2PcInstance activeChar, L2PcInstance playerInstance)
{
- if (TvTEvent.isPlayerParticipant(playerInstance.getObjectId()))
+ if (playerInstance.isOnEvent())
{
activeChar.sendMessage("Player already participated in the event!");
return;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
index bd703f873e..c4ce851857 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/OlympiadObservation.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2OlympiadManagerInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.entity.TvTEvent;
import com.l2jserver.gameserver.model.olympiad.Olympiad;
import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
@@ -79,9 +78,9 @@ public class OlympiadObservation implements IBypassHandler
return false;
}
- if (!TvTEvent.isInactive() && TvTEvent.isPlayerParticipant(activeChar.getObjectId()))
+ if (activeChar.isOnEvent())
{
- activeChar.sendMessage("You can not observe games while registered for TvT");
+ activeChar.sendMessage("You can not observe games while registered on an event");
return false;
}
--
GitLab