From 0fb64042824763a0c7d2ad71f9b8cd77759bfe5a Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 11 Dec 2016 15:56:29 +0000
Subject: [PATCH] Fixed castle doors not been destroyed.

---
 .../gameserver/model/actor/instance/L2DoorInstance.java      | 4 ++++
 .../gameserver/network/serverpackets/StaticObject.java       | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index 0c7af0a2bc..54ee937760 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -239,6 +239,10 @@ public final class L2DoorInstance extends L2Character
 	
 	public int getDamage()
 	{
+		if (getCastle() == null)
+		{
+			return 0;
+		}
 		final int dmg = 6 - (int) Math.ceil((getCurrentHp() / getMaxHp()) * 6);
 		if (dmg > 6)
 		{
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java
index 148dd21727..ca5fa31d87 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/StaticObject.java
@@ -36,6 +36,7 @@ public class StaticObject implements IClientOutgoingPacket
 	private final int _maxHp;
 	private final int _currentHp;
 	private final boolean _showHp;
+	private final int _damageGrade;
 	
 	public StaticObject(L2StaticObjectInstance staticObject)
 	{
@@ -49,6 +50,7 @@ public class StaticObject implements IClientOutgoingPacket
 		_maxHp = 0;
 		_currentHp = 0;
 		_showHp = false;
+		_damageGrade = 0;
 	}
 	
 	public StaticObject(L2DoorInstance door, boolean targetable)
@@ -63,6 +65,7 @@ public class StaticObject implements IClientOutgoingPacket
 		_maxHp = door.getMaxHp();
 		_currentHp = (int) door.getCurrentHp();
 		_showHp = door.getIsShowHp();
+		_damageGrade = door.getDamage();
 	}
 	
 	@Override
@@ -80,7 +83,7 @@ public class StaticObject implements IClientOutgoingPacket
 		packet.writeD(_currentHp);
 		packet.writeD(_maxHp);
 		packet.writeD(_showHp ? 1 : 0);
-		packet.writeD(0x00);
+		packet.writeD(_damageGrade);
 		return true;
 	}
 }