From 94db2002108e3f7854b6b13397fbadb4d241336f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 21 Aug 2017 22:00:48 +0000 Subject: [PATCH] Enabling use feather button. --- .../gameserver/network/clientpackets/RequestRestartPoint.java | 2 +- .../com/l2jmobius/gameserver/network/serverpackets/Die.java | 2 +- .../gameserver/network/clientpackets/RequestRestartPoint.java | 2 +- .../com/l2jmobius/gameserver/network/serverpackets/Die.java | 2 +- .../gameserver/network/clientpackets/RequestRestartPoint.java | 2 +- .../com/l2jmobius/gameserver/network/serverpackets/Die.java | 2 +- .../gameserver/network/clientpackets/RequestRestartPoint.java | 2 +- .../com/l2jmobius/gameserver/network/serverpackets/Die.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index ea56ec08fe..e7b3af4a35 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -231,7 +231,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } break; } - case 6: // TODO: Agathon resurrection + case 6: // TODO: Agathion resurrection { break; } diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/serverpackets/Die.java index 065cbbe471..7110fa3f8c 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/serverpackets/Die.java @@ -74,7 +74,7 @@ public class Die implements IClientOutgoingPacket _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; _toOutpost = ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()); - _useFeather = activeChar.getAccessLevel().allowFixedRes(); + _useFeather = activeChar.getAccessLevel().allowFixedRes() || activeChar.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index ea56ec08fe..e7b3af4a35 100644 --- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -231,7 +231,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } break; } - case 6: // TODO: Agathon resurrection + case 6: // TODO: Agathion resurrection { break; } diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/Die.java index 065cbbe471..7110fa3f8c 100644 --- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/Die.java @@ -74,7 +74,7 @@ public class Die implements IClientOutgoingPacket _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; _toOutpost = ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()); - _useFeather = activeChar.getAccessLevel().allowFixedRes(); + _useFeather = activeChar.getAccessLevel().allowFixedRes() || activeChar.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index ea56ec08fe..e7b3af4a35 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -231,7 +231,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } break; } - case 6: // TODO: Agathon resurrection + case 6: // TODO: Agathion resurrection { break; } diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/serverpackets/Die.java index 065cbbe471..7110fa3f8c 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/serverpackets/Die.java @@ -74,7 +74,7 @@ public class Die implements IClientOutgoingPacket _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; _toOutpost = ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()); - _useFeather = activeChar.getAccessLevel().allowFixedRes(); + _useFeather = activeChar.getAccessLevel().allowFixedRes() || activeChar.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index ea56ec08fe..e7b3af4a35 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -231,7 +231,7 @@ public final class RequestRestartPoint implements IClientIncomingPacket } break; } - case 6: // TODO: Agathon resurrection + case 6: // TODO: Agathion resurrection { break; } diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java index 065cbbe471..7110fa3f8c 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/serverpackets/Die.java @@ -74,7 +74,7 @@ public class Die implements IClientOutgoingPacket _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; _toOutpost = ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()); - _useFeather = activeChar.getAccessLevel().allowFixedRes(); + _useFeather = activeChar.getAccessLevel().allowFixedRes() || activeChar.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; }