lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QuestState isNowAvailable method should not return null values as true.

Browse Source
This commit is contained in:
MobiusDev
2018-07-07 12:23:10 +00:00
parent cffea875fd
commit fd58e1bfa7
9 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)

3
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java vendored
View File

@@ -61,7 +61,7 @@ public final class BlackMarketeerOfMammon extends AbstractNpcAI
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
final QuestState qs = getQuestState(player, true); final QuestState qs = getQuestState(player, true);
if (!qs.isNowAvailable()) if ((qs.get("restartTime") != null) && !qs.isNowAvailable())
{ {
htmltext = "31092-03.html"; htmltext = "31092-03.html";
} }

3
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -35,7 +35,6 @@ import com.l2jmobius.gameserver.network.serverpackets.TutorialCloseHtml;
import com.l2jmobius.gameserver.network.serverpackets.TutorialEnableClientEvent; import com.l2jmobius.gameserver.network.serverpackets.TutorialEnableClientEvent;
import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml;
import com.l2jmobius.gameserver.network.serverpackets.TutorialShowQuestionMark; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowQuestionMark;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -749,7 +748,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
/** /**

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)

3
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerQuestComplete;
import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark; import com.l2jmobius.gameserver.network.serverpackets.ExShowQuestMark;
import com.l2jmobius.gameserver.network.serverpackets.QuestList; import com.l2jmobius.gameserver.network.serverpackets.QuestList;
import com.l2jmobius.gameserver.util.Util;
/** /**
* Quest state class. * Quest state class.
@@ -823,7 +822,7 @@ public final class QuestState
public boolean isNowAvailable() public boolean isNowAvailable()
{ {
final String val = get("restartTime"); final String val = get("restartTime");
return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); return (val != null) && (Long.parseLong(val) <= System.currentTimeMillis());
} }
public void setSimulated(boolean simulated) public void setSimulated(boolean simulated)