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

Prevent SiegeScheduleData setNextSiegeDate NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-02-05 03:02:48 +00:00
parent d7c0988949
commit ff1525bcc3
23 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1441,7 +1441,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1407,7 +1407,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1407,7 +1407,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1438,7 +1438,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}

2
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@ -1443,7 +1443,7 @@ public class Siege implements Siegable
private void setNextSiegeDate()
{
final SiegeScheduleDate holder = SiegeScheduleData.getInstance().getScheduleDateForCastleId(_castle.getResidenceId());
if (!holder.siegeEnabled())
if ((holder == null) || !holder.siegeEnabled())
{
return;
}