Removed stream usage from PunishmentHolder.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

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

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

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

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

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

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/PunishmentHolder.java

@@ -37,8 +37,7 @@ public class PunishmentHolder
 	{
 		if (!task.isExpired())
 		{
-			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(String.valueOf(task.getKey()), k -> new ConcurrentHashMap<>()).put(task.getType(), task);
-			_holder.computeIfAbsent(key, k -> new ConcurrentHashMap<>()).put(task.getType(), task);
 		}
 	}
 	
@@ -63,17 +62,22 @@ public class PunishmentHolder
 	
 	public void stopPunishment(PunishmentType type)
 	{
-		_holder.values().stream().flatMap(p -> p.values().stream()).filter(p -> p.getType() == type).forEach(t ->
+		for (Map<PunishmentType, PunishmentTask> punishments : _holder.values())
 		{
-			t.stopPunishment();
+			for (PunishmentTask task : punishments.values())
-			final String key = String.valueOf(t.getKey());
-			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
-			punishments.remove(t.getType());
-			if (punishments.isEmpty())
 			{
-				_holder.remove(key);
+				if (task.getType() == type)
+				{
+					task.stopPunishment();
+					final String key = String.valueOf(task.getKey());
+					punishments.remove(task.getType());
+					if (punishments.isEmpty())
+					{
+						_holder.remove(key);
+					}
+				}
 			}
-		});
+		}
 	}
 	
 	/**