Addition of ExDieInfo packet.

This commit is contained in:
MobiusDevelopment
2020-07-06 13:35:24 +00:00
parent 3c1626c79a
commit ebadb9463e
10 changed files with 326 additions and 16 deletions

View File

@@ -4567,7 +4567,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
else if (isPlayer()) else if (isPlayer())
{ {
getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); getActingPlayer().getStatus().reduceHp(amount, attacker, skill, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
} }
else else
{ {

View File

@@ -35,6 +35,7 @@ import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -219,6 +220,7 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.events.timers.TimerHolder;
import org.l2jmobius.gameserver.model.fishing.Fishing; import org.l2jmobius.gameserver.model.fishing.Fishing;
import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder;
import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.MonsterBookCardHolder; import org.l2jmobius.gameserver.model.holders.MonsterBookCardHolder;
import org.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder; import org.l2jmobius.gameserver.model.holders.MonsterBookRewardHolder;
@@ -288,6 +290,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount;
import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; import org.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ExBrPremiumState; import org.l2jmobius.gameserver.network.serverpackets.ExBrPremiumState;
import org.l2jmobius.gameserver.network.serverpackets.ExDieInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExDuelUpdateUserInfo; import org.l2jmobius.gameserver.network.serverpackets.ExDuelUpdateUserInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket; import org.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
import org.l2jmobius.gameserver.network.serverpackets.ExGetOnAirShip; import org.l2jmobius.gameserver.network.serverpackets.ExGetOnAirShip;
@@ -470,6 +473,8 @@ public class PlayerInstance extends Playable
/** The PvP Flag state of the PlayerInstance (0=White, 1=Purple) */ /** The PvP Flag state of the PlayerInstance (0=White, 1=Purple) */
private byte _pvpFlag; private byte _pvpFlag;
private final List<DamageTakenHolder> _lastDamageTaken = new CopyOnWriteArrayList<>();
/** The Fame of this PlayerInstance */ /** The Fame of this PlayerInstance */
private int _fame; private int _fame;
private ScheduledFuture<?> _fameTask; private ScheduledFuture<?> _fameTask;
@@ -4742,6 +4747,8 @@ public class PlayerInstance extends Playable
@Override @Override
public boolean doDie(Creature killer) public boolean doDie(Creature killer)
{ {
Collection<ItemInstance> droppedItems = null;
if (killer != null) if (killer != null)
{ {
final PlayerInstance pk = killer.getActingPlayer(); final PlayerInstance pk = killer.getActingPlayer();
@@ -4850,7 +4857,7 @@ public class PlayerInstance extends Playable
final boolean insidePvpZone = isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE); final boolean insidePvpZone = isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE);
if ((pk == null) || !pk.isCursedWeaponEquipped()) if ((pk == null) || !pk.isCursedWeaponEquipped())
{ {
onDieDropItem(killer); // Check if any item should be dropped droppedItems = onDieDropItem(killer); // Check if any item should be dropped
if (!insidePvpZone && (pk != null)) if (!insidePvpZone && (pk != null))
{ {
final Clan pkClan = pk.getClan(); final Clan pkClan = pk.getClan();
@@ -4872,6 +4879,8 @@ public class PlayerInstance extends Playable
} }
} }
sendPacket(new ExDieInfo(droppedItems == null ? Collections.emptyList() : droppedItems, _lastDamageTaken));
if (isMounted()) if (isMounted())
{ {
stopFeed(); stopFeed();
@@ -4916,19 +4925,34 @@ public class PlayerInstance extends Playable
return true; return true;
} }
private void onDieDropItem(Creature killer) public void addDamageTaken(Creature attacker, Skill skill, double damage)
{ {
if (GameEvent.isParticipant(this) || (killer == null)) if (attacker == this)
{ {
return; return;
} }
_lastDamageTaken.add(new DamageTakenHolder(attacker, skill, damage));
while (_lastDamageTaken.size() > 10)
{
_lastDamageTaken.remove(0);
}
}
private Collection<ItemInstance> onDieDropItem(Creature killer)
{
final List<ItemInstance> droppedItems = new ArrayList<>();
if (GameEvent.isParticipant(this) || (killer == null))
{
return droppedItems;
}
final PlayerInstance pk = killer.getActingPlayer(); final PlayerInstance pk = killer.getActingPlayer();
if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId)
// || _clan.isAtWarWith(((PlayerInstance)killer).getClanId()) // || _clan.isAtWarWith(((PlayerInstance)killer).getClanId())
)) ))
{ {
return; return droppedItems;
} }
if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || Config.KARMA_DROP_GM)) if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || Config.KARMA_DROP_GM))
@@ -4992,6 +5016,8 @@ public class PlayerInstance extends Playable
if (Rnd.get(100) < itemDropPercent) if (Rnd.get(100) < itemDropPercent)
{ {
dropItem("DieDrop", itemDrop, killer, true); dropItem("DieDrop", itemDrop, killer, true);
droppedItems.add(itemDrop);
if (isKarmaDrop) if (isKarmaDrop)
{ {
LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount());
@@ -5009,6 +5035,8 @@ public class PlayerInstance extends Playable
} }
} }
} }
return droppedItems;
} }
public void onPlayerKill(Playable killedPlayable) public void onPlayerKill(Playable killedPlayable)
@@ -10077,6 +10105,8 @@ public class PlayerInstance extends Playable
{ {
instance.doRevive(this); instance.doRevive(this);
} }
_lastDamageTaken.clear();
} }
@Override @Override

View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.stat.PlayerStat;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.entity.Duel;
import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -60,16 +61,16 @@ public class PlayerStatus extends PlayableStatus
@Override @Override
public void reduceHp(double value, Creature attacker) public void reduceHp(double value, Creature attacker)
{ {
reduceHp(value, attacker, true, false, false, false); reduceHp(value, attacker, null, true, false, false, false);
} }
@Override @Override
public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption) public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
{ {
reduceHp(value, attacker, awake, isDOT, isHPConsumption, false); reduceHp(value, attacker, null, awake, isDOT, isHPConsumption, false);
} }
public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption, boolean ignoreCP) public void reduceHp(double value, Creature attacker, Skill skill, boolean awake, boolean isDOT, boolean isHPConsumption, boolean ignoreCP)
{ {
if (getActiveChar().isDead()) if (getActiveChar().isDead())
{ {
@@ -280,6 +281,11 @@ public class PlayerStatus extends PlayableStatus
if (amount > 0) if (amount > 0)
{ {
if ((skill != null) && skill.isBad())
{
getActiveChar().addDamageTaken(attacker, skill, amount);
}
double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0); double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
if (newHp <= 0) if (newHp <= 0)
{ {

View File

@@ -0,0 +1,52 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class DamageTakenHolder
{
private final Creature _creature;
private final Skill _skill;
private final double _damage;
public DamageTakenHolder(Creature creature, Skill skill, double amount)
{
_creature = creature;
_skill = skill;
_damage = amount;
}
public Creature getCreature()
{
return _creature;
}
public Skill getSkill()
{
return _skill;
}
public double getDamage()
{
return _damage;
}
}

View File

@@ -0,0 +1,67 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @author Mobius
*/
public class ExDieInfo implements IClientOutgoingPacket
{
private final Collection<ItemInstance> _droppedItems;
private final Collection<DamageTakenHolder> _lastDamageTaken;
public ExDieInfo(Collection<ItemInstance> droppedItems, Collection<DamageTakenHolder> lastDamageTaken)
{
_droppedItems = droppedItems;
_lastDamageTaken = lastDamageTaken;
}
@Override
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_DIE_INFO.writeId(packet);
packet.writeH(_droppedItems.size());
for (ItemInstance item : _droppedItems)
{
packet.writeD(item.getId());
packet.writeD(item.getEnchantLevel());
packet.writeD((int) item.getCount());
}
boolean first = true; // Missing first character from first name hack.
packet.writeH(_lastDamageTaken.size());
for (DamageTakenHolder damageHolder : _lastDamageTaken)
{
packet.writeS((first ? " " : "") + damageHolder.getCreature().getName());
packet.writeH(0x00);
packet.writeD(damageHolder.getSkill().getDisplayId());
packet.writeF(damageHolder.getDamage());
packet.writeD(0x00);
first = false;
}
return true;
}
}

View File

@@ -4587,7 +4587,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
} }
else if (isPlayer()) else if (isPlayer())
{ {
getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp); getActingPlayer().getStatus().reduceHp(amount, attacker, skill, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
} }
else else
{ {

View File

@@ -36,6 +36,7 @@ import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -222,6 +223,7 @@ import org.l2jmobius.gameserver.model.events.returns.TerminateReturn;
import org.l2jmobius.gameserver.model.events.timers.TimerHolder; import org.l2jmobius.gameserver.model.events.timers.TimerHolder;
import org.l2jmobius.gameserver.model.fishing.Fishing; import org.l2jmobius.gameserver.model.fishing.Fishing;
import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder; import org.l2jmobius.gameserver.model.holders.AttendanceInfoHolder;
import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
import org.l2jmobius.gameserver.model.holders.ElementalSpiritDataHolder; import org.l2jmobius.gameserver.model.holders.ElementalSpiritDataHolder;
import org.l2jmobius.gameserver.model.holders.ItemHolder; import org.l2jmobius.gameserver.model.holders.ItemHolder;
import org.l2jmobius.gameserver.model.holders.MovieHolder; import org.l2jmobius.gameserver.model.holders.MovieHolder;
@@ -288,6 +290,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExAbnormalStatusUpdateFrom
import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount; import org.l2jmobius.gameserver.network.serverpackets.ExAdenaInvenCount;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot; import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.ExBrPremiumState; import org.l2jmobius.gameserver.network.serverpackets.ExBrPremiumState;
import org.l2jmobius.gameserver.network.serverpackets.ExDieInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExDuelUpdateUserInfo; import org.l2jmobius.gameserver.network.serverpackets.ExDuelUpdateUserInfo;
import org.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket; import org.l2jmobius.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
import org.l2jmobius.gameserver.network.serverpackets.ExGetOnAirShip; import org.l2jmobius.gameserver.network.serverpackets.ExGetOnAirShip;
@@ -468,6 +471,8 @@ public class PlayerInstance extends Playable
/** The PvP Flag state of the PlayerInstance (0=White, 1=Purple) */ /** The PvP Flag state of the PlayerInstance (0=White, 1=Purple) */
private byte _pvpFlag; private byte _pvpFlag;
private final List<DamageTakenHolder> _lastDamageTaken = new CopyOnWriteArrayList<>();
/** The Fame of this PlayerInstance */ /** The Fame of this PlayerInstance */
private int _fame; private int _fame;
private ScheduledFuture<?> _fameTask; private ScheduledFuture<?> _fameTask;
@@ -4715,6 +4720,8 @@ public class PlayerInstance extends Playable
@Override @Override
public boolean doDie(Creature killer) public boolean doDie(Creature killer)
{ {
Collection<ItemInstance> droppedItems = null;
if (killer != null) if (killer != null)
{ {
final PlayerInstance pk = killer.getActingPlayer(); final PlayerInstance pk = killer.getActingPlayer();
@@ -4820,7 +4827,7 @@ public class PlayerInstance extends Playable
final boolean insidePvpZone = isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE); final boolean insidePvpZone = isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE);
if ((pk == null) || !pk.isCursedWeaponEquipped()) if ((pk == null) || !pk.isCursedWeaponEquipped())
{ {
onDieDropItem(killer); // Check if any item should be dropped droppedItems = onDieDropItem(killer); // Check if any item should be dropped
if (!insidePvpZone && (pk != null)) if (!insidePvpZone && (pk != null))
{ {
final Clan pkClan = pk.getClan(); final Clan pkClan = pk.getClan();
@@ -4842,6 +4849,8 @@ public class PlayerInstance extends Playable
} }
} }
sendPacket(new ExDieInfo(droppedItems == null ? Collections.emptyList() : droppedItems, _lastDamageTaken));
if (isMounted()) if (isMounted())
{ {
stopFeed(); stopFeed();
@@ -4886,19 +4895,34 @@ public class PlayerInstance extends Playable
return true; return true;
} }
private void onDieDropItem(Creature killer) public void addDamageTaken(Creature attacker, Skill skill, double damage)
{ {
if (GameEvent.isParticipant(this) || (killer == null)) if (attacker == this)
{ {
return; return;
} }
_lastDamageTaken.add(new DamageTakenHolder(attacker, skill, damage));
while (_lastDamageTaken.size() > 10)
{
_lastDamageTaken.remove(0);
}
}
private Collection<ItemInstance> onDieDropItem(Creature killer)
{
final List<ItemInstance> droppedItems = new ArrayList<>();
if (GameEvent.isParticipant(this) || (killer == null))
{
return droppedItems;
}
final PlayerInstance pk = killer.getActingPlayer(); final PlayerInstance pk = killer.getActingPlayer();
if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId) if ((getReputation() >= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(_clanId)
// || _clan.isAtWarWith(((PlayerInstance)killer).getClanId()) // || _clan.isAtWarWith(((PlayerInstance)killer).getClanId())
)) ))
{ {
return; return droppedItems;
} }
if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || Config.KARMA_DROP_GM)) if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || Config.KARMA_DROP_GM))
@@ -4963,6 +4987,8 @@ public class PlayerInstance extends Playable
if (Rnd.get(100) < itemDropPercent) if (Rnd.get(100) < itemDropPercent)
{ {
dropItem("DieDrop", itemDrop, killer, true); dropItem("DieDrop", itemDrop, killer, true);
droppedItems.add(itemDrop);
if (isKarmaDrop) if (isKarmaDrop)
{ {
LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount()); LOGGER.warning(getName() + " has karma and dropped id = " + itemDrop.getId() + ", count = " + itemDrop.getCount());
@@ -4980,6 +5006,8 @@ public class PlayerInstance extends Playable
} }
} }
} }
return droppedItems;
} }
public void onPlayerKill(Playable killedPlayable) public void onPlayerKill(Playable killedPlayable)
@@ -9969,6 +9997,8 @@ public class PlayerInstance extends Playable
{ {
instance.doRevive(this); instance.doRevive(this);
} }
_lastDamageTaken.clear();
} }
@Override @Override

View File

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.model.actor.stat.PlayerStat;
import org.l2jmobius.gameserver.model.effects.EffectFlag; import org.l2jmobius.gameserver.model.effects.EffectFlag;
import org.l2jmobius.gameserver.model.entity.Duel; import org.l2jmobius.gameserver.model.entity.Duel;
import org.l2jmobius.gameserver.model.skills.AbnormalType; import org.l2jmobius.gameserver.model.skills.AbnormalType;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Formulas; import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat; import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -60,16 +61,16 @@ public class PlayerStatus extends PlayableStatus
@Override @Override
public void reduceHp(double value, Creature attacker) public void reduceHp(double value, Creature attacker)
{ {
reduceHp(value, attacker, true, false, false, false); reduceHp(value, attacker, null, true, false, false, false);
} }
@Override @Override
public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption) public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
{ {
reduceHp(value, attacker, awake, isDOT, isHPConsumption, false); reduceHp(value, attacker, null, awake, isDOT, isHPConsumption, false);
} }
public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption, boolean ignoreCP) public void reduceHp(double value, Creature attacker, Skill skill, boolean awake, boolean isDOT, boolean isHPConsumption, boolean ignoreCP)
{ {
if (getActiveChar().isDead()) if (getActiveChar().isDead())
{ {
@@ -280,6 +281,11 @@ public class PlayerStatus extends PlayableStatus
if (amount > 0) if (amount > 0)
{ {
if ((skill != null) && skill.isBad())
{
getActiveChar().addDamageTaken(attacker, skill, amount);
}
double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0); double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
if (newHp <= 0) if (newHp <= 0)
{ {

View File

@@ -0,0 +1,52 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.model.holders;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class DamageTakenHolder
{
private final Creature _creature;
private final Skill _skill;
private final double _damage;
public DamageTakenHolder(Creature creature, Skill skill, double amount)
{
_creature = creature;
_skill = skill;
_damage = amount;
}
public Creature getCreature()
{
return _creature;
}
public Skill getSkill()
{
return _skill;
}
public double getDamage()
{
return _damage;
}
}

View File

@@ -0,0 +1,67 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.holders.DamageTakenHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @author Mobius
*/
public class ExDieInfo implements IClientOutgoingPacket
{
private final Collection<ItemInstance> _droppedItems;
private final Collection<DamageTakenHolder> _lastDamageTaken;
public ExDieInfo(Collection<ItemInstance> droppedItems, Collection<DamageTakenHolder> lastDamageTaken)
{
_droppedItems = droppedItems;
_lastDamageTaken = lastDamageTaken;
}
@Override
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_DIE_INFO.writeId(packet);
packet.writeH(_droppedItems.size());
for (ItemInstance item : _droppedItems)
{
packet.writeD(item.getId());
packet.writeD(item.getEnchantLevel());
packet.writeD((int) item.getCount());
}
boolean first = true; // Missing first character from first name hack.
packet.writeH(_lastDamageTaken.size());
for (DamageTakenHolder damageHolder : _lastDamageTaken)
{
packet.writeS((first ? " " : "") + damageHolder.getCreature().getName());
packet.writeH(0x00);
packet.writeD(damageHolder.getSkill().getDisplayId());
packet.writeF(damageHolder.getDamage());
packet.writeD(0x00);
first = false;
}
return true;
}
}