Selaa lähdekoodia

BETA: Fixing minor typos in [6239].
* Reported by: sponer
* Tested by: sponer

Rumen Nikiforov 11 vuotta sitten
vanhempi
sitoutus
7c7ac1414b

+ 22 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/AbsorberInfo.java

@@ -54,4 +54,26 @@ public final class AbsorberInfo implements IUniqueId
 	{
 		_objectId = objectId;
 	}
+	
+	@Override
+	public final boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj instanceof DamageDoneInfo)
+		{
+			return (((AbsorberInfo) obj).getObjectId() == _objectId);
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public final int hashCode()
+	{
+		return _objectId;
+	}
 }

+ 22 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/AggroInfo.java

@@ -73,4 +73,26 @@ public final class AggroInfo
 	{
 		_damage = (int) Math.min(_damage + (long) value, 999999999);
 	}
+	
+	@Override
+	public final boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj instanceof AggroInfo)
+		{
+			return (((AggroInfo) obj).getAttacker() == _attacker);
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public final int hashCode()
+	{
+		return _attacker.getObjectId();
+	}
 }

+ 22 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/DamageDoneInfo.java

@@ -48,4 +48,26 @@ public final class DamageDoneInfo
 	{
 		return _damage;
 	}
+	
+	@Override
+	public final boolean equals(Object obj)
+	{
+		if (this == obj)
+		{
+			return true;
+		}
+		
+		if (obj instanceof DamageDoneInfo)
+		{
+			return (((DamageDoneInfo) obj).getAttacker() == _attacker);
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public final int hashCode()
+	{
+		return _attacker.getObjectId();
+	}
 }

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/holders/ItemChanceHolder.java

@@ -22,7 +22,7 @@ package com.l2jserver.gameserver.model.holders;
  * Item holder, with additional parameter chance.
  * @author xban1x
  */
-public final class ItemChanceHolder extends ItemHolder
+public class ItemChanceHolder extends ItemHolder
 {
 	private final double _chance;
 	

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.interfaces.ILocational;
  * Holds depending between NPC's spawn point and route
  * @author GKR
  */
-public class NpcRoutesHolder
+public final class NpcRoutesHolder
 {
 	private final Map<String, String> _correspondences;
 	

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.punishment.PunishmentType;
 /**
  * @author UnAfraid
  */
-public class PunishmentHolder
+public final class PunishmentHolder
 {
 	private final Map<String, Map<PunishmentType, PunishmentTask>> _holder = new ConcurrentHashMap<>();
 	

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/holders/QuestItemHolder.java

@@ -22,7 +22,7 @@ package com.l2jserver.gameserver.model.holders;
  * Item Holder storing chance in addition for quests.
  * @author xban1x
  */
-public final class QuestItemHolder extends ItemHolder
+public class QuestItemHolder extends ItemHolder
 {
 	private final int _chance;