Browse Source

Npe pixies.

JIV 15 năm trước cách đây
mục cha
commit
6b6fa57386

+ 4 - 4
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -4546,8 +4546,8 @@ public final class L2PcInstance extends L2Playable
 				if (mov instanceof CharInfo)
 				{
 					int relation = getRelation(player);
-					if (getKnownList().getKnownRelations().get(player.getObjectId()) != null
-					        && getKnownList().getKnownRelations().get(player.getObjectId()) != relation)
+					Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId());
+					if (oldrelation != null && oldrelation != relation)
 					{
 						player.sendPacket(new RelationChanged(this, relation, player.isAutoAttackable(this)));
 						if (getPet() != null)
@@ -4579,8 +4579,8 @@ public final class L2PcInstance extends L2Playable
 					if (mov instanceof CharInfo)
 					{
 						int relation = getRelation(player);
-						if (getKnownList().getKnownRelations().get(player.getObjectId()) != null
-						        && getKnownList().getKnownRelations().get(player.getObjectId()) != relation)
+						Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId());
+						if (oldrelation != null && oldrelation != relation)
 						{
 							player.sendPacket(new RelationChanged(this, relation, player.isAutoAttackable(this)));
 							if (getPet() != null)

+ 6 - 1
L2_GameServer/java/com/l2jserver/gameserver/util/Broadcast.java

@@ -25,6 +25,7 @@
 package com.l2jserver.gameserver.util;
 
 import java.util.Collection;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.Config;
@@ -105,13 +106,16 @@ public final class Broadcast
 		{
 			for (L2PcInstance player : plrs)
 			{
+				if (player == null)
+					continue;
 				try
 				{
 					player.sendPacket(mov);
 					if (mov instanceof CharInfo && character instanceof L2PcInstance)
 					{
 						int relation = ((L2PcInstance) character).getRelation(player);
-						if (character.getKnownList().getKnownRelations().get(player.getObjectId()) != null && character.getKnownList().getKnownRelations().get(player.getObjectId()) != relation)
+						Integer oldrelation = character.getKnownList().getKnownRelations().get(player.getObjectId());
+						if (oldrelation != null && oldrelation != relation)
 						{
 							player.sendPacket(new RelationChanged((L2PcInstance) character, relation, player.isAutoAttackable(character)));
 							if (((L2PcInstance) character).getPet() != null)
@@ -121,6 +125,7 @@ public final class Broadcast
 				}
 				catch (NullPointerException e)
 				{
+					_log.log(Level.WARNING, e.getMessage(),e);
 				}
 			}
 		}