lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use geodata to correct spawn z value.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-22 14:56:54 +00:00
parent 6b08dfde5c
commit d12b97d3cb
14 changed files with 124 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
View File

@@ -23,6 +23,7 @@ import java.util.logging.Logger;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.datatables.sql.TerritoryTable;
import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.idfactory.IdFactory;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@@ -497,44 +498,53 @@ public class Spawn
newlocz = _locZ;
}
if (npc != null)
// if (npc != null)
// {
// Do not correct z of flying NPCs.
if (!npc.isFlying())
{
npc.stopAllEffects();
// Set the HP and MP of the NpcInstance to the max
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
// Set the heading of the NpcInstance (random heading if not defined)
if (_heading == -1)
{
npc.setHeading(Rnd.get(61794));
}
else
{
npc.setHeading(_heading);
}
// Reset decay info
npc.setDecayed(false);
// Link the NpcInstance to this Spawn
npc.setSpawn(this);
// Init other values of the NpcInstance (ex : from its CreatureTemplate for INT, STR, DEX...) and add it in the world as a visible object
npc.spawnMe(newlocx, newlocy, newlocz);
notifyNpcSpawned(npc);
_lastSpawn = npc;
for (Quest quest : npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_SPAWN))
{
quest.notifySpawn(npc);
}
// Increase the current number of NpcInstance managed by this Spawn
_currentCount++;
newlocz = GeoEngine.getInstance().getHeight(newlocx, newlocy, newlocz);
}
npc.stopAllEffects();
// Set the HP and MP of the NpcInstance to the max
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
// Set the heading of the NpcInstance (random heading if not defined)
if (_heading == -1)
{
npc.setHeading(Rnd.get(61794));
}
else
{
npc.setHeading(_heading);
}
// Reset decay info
npc.setDecayed(false);
// Link the NpcInstance to this Spawn
npc.setSpawn(this);
// Init other values of the NpcInstance (ex : from its CreatureTemplate for INT, STR, DEX...) and add it in the world as a visible object
npc.spawnMe(newlocx, newlocy, newlocz);
notifyNpcSpawned(npc);
_lastSpawn = npc;
for (Quest quest : npc.getTemplate().getEventQuests(Quest.QuestEventType.ON_SPAWN))
{
quest.notifySpawn(npc);
}
// Increase the current number of NpcInstance managed by this Spawn
_currentCount++;
// }
return npc;
}