Quellcode durchsuchen

minor npe fixes

Sami vor 16 Jahren
Ursprung
Commit
55662111cd

+ 6 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Character.java

@@ -3809,7 +3809,12 @@ public abstract class L2Character extends L2Object
 			_castInterruptTime = 0;
 			if (_skillCast != null)
 			{
-				_skillCast.cancel(true);
+				try 
+				{
+					_skillCast.cancel(true);
+				}
+				catch (NullPointerException e) {}
+				
 				_skillCast = null;
 			}
 

+ 7 - 3
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Party.java

@@ -374,9 +374,13 @@ public class L2Party {
 						getCommandChannel().removeParty(this);
 					}
 				}
-				getLeader().setParty(null);
-				if (getLeader().isInDuel())
-					DuelManager.getInstance().onRemoveFromParty(getLeader());
+				L2PcInstance leader = getLeader();
+				if (leader != null)
+				{
+					leader.setParty(null);
+					if (leader.isInDuel())
+						DuelManager.getInstance().onRemoveFromParty(leader);
+				}
 			}
 		}
 	}