Fixed probable restoring ClanWar NPE.
This commit is contained in:
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -100,8 +100,11 @@ public final class ClanWar
|
|||||||
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
final long endTimePeriod = _endTime + (_state == ClanWarState.TIE ? TIME_TO_DELETION_AFTER_CANCELLATION : TIME_TO_DELETION_AFTER_DEFEAT);
|
||||||
|
|
||||||
if (endTimePeriod > System.currentTimeMillis())
|
if (endTimePeriod > System.currentTimeMillis())
|
||||||
|
{
|
||||||
|
ThreadPool.schedule(() ->
|
||||||
{
|
{
|
||||||
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
ClanTable.getInstance().deleteClanWars(_attackerClanId, _attackedClanId);
|
||||||
|
}, 10000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user