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

Updated to Java 17.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-10-13 21:39:56 +00:00
parent a47d1bf797
commit cdbc38c32b
213 changed files with 1072 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@@ -126,7 +126,8 @@ public class WyvernManager extends AbstractNpcAI
{
return false;
}
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@@ -162,7 +163,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:
{
@@ -186,7 +188,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:
{
@@ -233,19 +236,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
{
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":
@@ -257,7 +265,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
final ManagerType type = MANAGERS.get(npc.getId());
if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
{
htmltext = "wyvernmanager-dusk.html";
}
@@ -292,7 +301,8 @@ public class WyvernManager extends AbstractNpcAI
}
else
{
if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
final ManagerType type = MANAGERS.get(npc.getId());
if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK))
{
htmltext = "wyvernmanager-dusk.html";
}

3
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java vendored
View File

@@ -76,7 +76,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:
{