浏览代码

BETA/STABLE: NPE fix by JIV (requested by UnAfraid).

MELERIX 14 年之前
父节点
当前提交
f4e03a8079
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -1420,7 +1420,7 @@ public class SevenSigns
 				
 				if (isSealValidationPeriod() || isCompResultsPeriod())
 				{
-					if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && !currPlayer.getString("cabal").equals(compWinner))
+					if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && (currPlayer == null || !currPlayer.getString("cabal").equals(compWinner)))
 					{
 						onlinePlayer.teleToLocation(MapRegionTable.TeleportWhereType.Town);
 						onlinePlayer.setIsIn7sDungeon(false);
@@ -1429,7 +1429,7 @@ public class SevenSigns
 				}
 				else
 				{
-					if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && !currPlayer.getString("cabal").isEmpty())
+					if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && (currPlayer == null || !currPlayer.getString("cabal").isEmpty()))
 					{
 						onlinePlayer.teleToLocation(MapRegionTable.TeleportWhereType.Town);
 						onlinePlayer.setIsIn7sDungeon(false);