From 2253b85d9784fdf2bca2aada7d0354f4279af3a7 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Tue, 1 Jan 2013 20:46:35 +0000
Subject: [PATCH] BETA: Misc changes. * Removes SuppressWarning warning.
---
.../dist/game/data/html/fortress/logistics-1.htm | 4 +++-
.../dist/game/data/html/fortress/logistics-noprivs.htm | 3 ++-
.../dist/game/data/html/fortress/logistics.htm | 7 ++++---
.../Q00194_SevenSignsMammonsContract.java | 2 +-
.../Q00197_SevenSignsTheSacredBookOfSeal.java | 3 +--
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-1.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-1.htm
index 1f65050f9d..7c1f5b33c0 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-1.htm
@@ -1 +1,3 @@
-<html><body>We cannot predict exactly when we may be attacked by forces from an enemy castle or fortress. We are constantly on guard, but the tension is making our soldiers nervous... </body></html>
\ No newline at end of file
+<html><body>
+We cannot predict exactly when we may be attacked by forces from an enemy castle or fortress. We are constantly on guard, but the tension is making our soldiers nervous...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-noprivs.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-noprivs.htm
index e755b6457e..6f78c21921 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-noprivs.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics-noprivs.htm
@@ -1,2 +1,3 @@
-<html><body><center>You are not authorized to perform that function.</center>
+<html><body>
+<center>You are not authorized to perform that function.</center>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics.htm b/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics.htm
index 2df86d7406..65a97c7856 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/fortress/logistics.htm
@@ -1,6 +1,6 @@
-<html><body>It is our responsibility as the Supply Department to manage all the supplies used by the fortress garrison. This includes supplies from the castle as well as weapons and armor designed to help increase the soldiers' effectiveness. There are even some very special rewards that can be found here... <br>
+<html><body>
+It is our responsibility as the Supply Department to manage all the supplies used by the fortress garrison. This includes supplies from the castle as well as weapons and armor designed to help increase the soldiers' effectiveness. There are even some very special rewards that can be found here...<br>
<br>
-
<center>
<br>
<a action="bypass -h npc_%objectId%_Chat 1">Check fortress security.</a>
@@ -8,4 +8,5 @@
<a action="bypass -h npc_%objectId%_supplylvl">Check supplies.</a>
<br>
<a action="bypass -h npc_%objectId%_rewards">Check rewards.</a>
-</center></body></html>
\ No newline at end of file
+</center>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index 10f966bfe1..aaad0e4ea0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -361,7 +361,7 @@ public class Q00194_SevenSignsMammonsContract extends Quest
if (npc.getNpcId() == SIR_GUSTAV_ATHEBALDT)
{
st = player.getQuestState(Q00193_SevenSignsDyingMessage.class.getSimpleName());
- htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "30760-01.htm" : "30760-05.html";
+ htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && st.isCompleted()) ? "30760-01.htm" : "30760-05.html";
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 7ac656498c..ca2b7755db 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -219,7 +219,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
}
@Override
- @SuppressWarnings("null")
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = player.getQuestState(getName());
@@ -240,7 +239,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
{
if (npc.getNpcId() == WOOD)
{
- // st = player.getQuestState(Q00196_SevenSignsSealOfTheEmperor.class.getSimpleName()); // TODO: Un-comment when quest is committed.
+ st = player.getQuestState("Q00196_SevenSignsSealOfTheEmperor");
htmltext = ((player.getLevel() >= MIN_LEVEL) && (st != null) && (st.isCompleted())) ? "32593-01.htm" : "32593-05.html";
}
break;
--
GitLab