Updated to Java 17.
This commit is contained in:
@@ -98,7 +98,8 @@ public class WyvernManager extends AbstractNpcAI
|
||||
|
||||
private boolean isOwnerClan(Npc npc, PlayerInstance player)
|
||||
{
|
||||
switch (MANAGERS.get(npc.getId()))
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
switch (type)
|
||||
{
|
||||
case CASTLE:
|
||||
{
|
||||
@@ -134,7 +135,8 @@ public class WyvernManager extends AbstractNpcAI
|
||||
|
||||
private boolean isInSiege(Npc npc)
|
||||
{
|
||||
switch (MANAGERS.get(npc.getId()))
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
switch (type)
|
||||
{
|
||||
case CASTLE:
|
||||
{
|
||||
@@ -153,7 +155,8 @@ public class WyvernManager extends AbstractNpcAI
|
||||
|
||||
private String getResidenceName(Npc npc)
|
||||
{
|
||||
switch (MANAGERS.get(npc.getId()))
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
switch (type)
|
||||
{
|
||||
case CASTLE:
|
||||
{
|
||||
@@ -200,19 +203,24 @@ public class WyvernManager extends AbstractNpcAI
|
||||
{
|
||||
htmltext = replaceAll(npc, player);
|
||||
}
|
||||
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
|
||||
{
|
||||
htmltext = "wyvernmanager-dusk.html";
|
||||
}
|
||||
else
|
||||
{
|
||||
htmltext = replaceAll(npc, player);
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
if (type == ManagerType.CASTLE)
|
||||
{
|
||||
htmltext = "wyvernmanager-dusk.html";
|
||||
}
|
||||
else
|
||||
{
|
||||
htmltext = replaceAll(npc, player);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "Help":
|
||||
{
|
||||
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
|
||||
break;
|
||||
}
|
||||
case "RideWyvern":
|
||||
@@ -224,7 +232,8 @@ public class WyvernManager extends AbstractNpcAI
|
||||
player.sendMessage("You cannot summon wyvern while in siege.");
|
||||
return null;
|
||||
}
|
||||
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
if (type == ManagerType.CASTLE)
|
||||
{
|
||||
htmltext = "wyvernmanager-dusk.html";
|
||||
}
|
||||
@@ -255,13 +264,17 @@ public class WyvernManager extends AbstractNpcAI
|
||||
{
|
||||
htmltext = replaceAll(npc, player);
|
||||
}
|
||||
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
|
||||
{
|
||||
htmltext = "wyvernmanager-dusk.html";
|
||||
}
|
||||
else
|
||||
{
|
||||
htmltext = replaceAll(npc, player);
|
||||
final ManagerType type = MANAGERS.get(npc.getId());
|
||||
if (type == ManagerType.CASTLE)
|
||||
{
|
||||
htmltext = "wyvernmanager-dusk.html";
|
||||
}
|
||||
else
|
||||
{
|
||||
htmltext = replaceAll(npc, player);
|
||||
}
|
||||
}
|
||||
return htmltext;
|
||||
}
|
||||
|
@@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
|
||||
|
||||
public OpBlinkSkillCondition(StatSet params)
|
||||
{
|
||||
switch (params.getEnum("direction", Position.class))
|
||||
final Position position = params.getEnum("direction", Position.class);
|
||||
switch (position)
|
||||
{
|
||||
case BACK:
|
||||
{
|
||||
|
@@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI
|
||||
return htmltext += "no.html";
|
||||
}
|
||||
|
||||
switch (MASTERS.get(npc.getId()))
|
||||
final Race race = MASTERS.get(npc.getId());
|
||||
switch (race)
|
||||
{
|
||||
case HUMAN:
|
||||
{
|
||||
|
Reference in New Issue
Block a user