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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
trunk/java/com/l2jmobius/gameserver/model/holders/PunishmentHolder.java
View File

@ -37,8 +37,7 @@ public final class PunishmentHolder
{
if (!task.isExpired())
{
final String key = String.valueOf(task.getKey());
_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
}
}
@ -49,15 +48,16 @@ public final class PunishmentHolder
public void stopPunishment(PunishmentTask task)
{
final String key = String.valueOf(task.getKey());
if (_holder.containsKey(key))
if (!_holder.containsKey(key))
{
task.stopPunishment();
final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
punishments.remove(task.getType());
if (punishments.isEmpty())
{
_holder.remove(key);
}
return;
}
task.stopPunishment();
final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
punishments.remove(task.getType());
if (punishments.isEmpty())
{
_holder.remove(key);
}
}
@ -78,10 +78,6 @@ public final class PunishmentHolder
*/
public PunishmentTask getPunishment(String key, PunishmentType type)
{
if (_holder.containsKey(key))
{
return _holder.get(key).get(type);
}
return null;
return _holder.containsKey(key) ? _holder.get(key).get(type) : null;
}
}