diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index e645f5a67a..1c96512428 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java index ca2c9d0e9c..de4fec440e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b733a393ed..782b5274ce 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12478,26 +12478,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index e645f5a67a..1c96512428 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1bd7bf98ca..632de8033d 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12485,26 +12485,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index c17a081f55..6675a4446f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 36df23588f..e63dce7902 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12487,26 +12487,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index c17a081f55..6675a4446f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2427f88b7b..4641a8ca45 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12467,26 +12467,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8acdcc082c..c9fab0c445 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 554ba0b915..0d9cb29023 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12454,26 +12454,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8acdcc082c..c9fab0c445 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0cbb0a7c79..9bee7515f7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12457,26 +12457,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8acdcc082c..c9fab0c445 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d749b1d7a6..6ea39294bc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12463,26 +12463,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 63fc361334..4bb21fadab 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java index ddc98a77d4..e33a55dcc7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 49d42307de..fa784fd1f9 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12470,26 +12470,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 21c98e8bd0..da03c6b165 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -118,8 +118,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -522,7 +522,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -530,7 +530,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 77ac00f8d3..2cc15fd29e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -937,12 +937,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/playerTemplates.xml b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/playerTemplates.xml index bc8bc51673..3874ab47b1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/playerTemplates.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/stats/playerTemplates.xml @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/playerTemplates.xsd b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/playerTemplates.xsd index dec8870f02..4e9a9defe7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/playerTemplates.xsd +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/xsd/playerTemplates.xsd @@ -27,7 +27,9 @@ + + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8fdf2bd171..057e9d12c5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -7871,10 +7871,10 @@ public class PlayerInstance extends Playable statement.setInt(29, getAppearance().getHairStyle()); statement.setInt(30, getAppearance().getHairColor()); statement.setInt(31, getAppearance().isFemale() ? 1 : 0); - statement.setDouble(32, 1/* getMovementMultiplier() */); - statement.setDouble(33, 1/* getAttackSpeedMultiplier() */); - statement.setDouble(34, getTemplate().getCollisionRadius()); - statement.setDouble(35, getTemplate().getCollisionHeight()); + statement.setDouble(32, 1 /* getMovementMultiplier() */); + statement.setDouble(33, 1 /* getAttackSpeedMultiplier() */); + statement.setDouble(34, getCollisionRadius()); + statement.setDouble(35, getCollisionHeight()); statement.setLong(36, getExp()); statement.setInt(37, getSp()); statement.setInt(38, getKarma()); @@ -15385,6 +15385,24 @@ public class PlayerInstance extends Playable _offlineShopStart = time; } + public float getCollisionRadius() + { + if (isMounted() && (_summon != null)) + { + return _summon.getTemplate().getCollisionRadius(); + } + return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); + } + + public float getCollisionHeight() + { + if (isMounted() && (_summon != null)) + { + return _summon.getTemplate().getCollisionHeight(); + } + return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); + } + /** * Return true if character falling now On the start of fall return false for correct coord sync !. * @param z the z diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 75bf44b864..ef9f68cd8c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -90,9 +90,14 @@ public class CreatureTemplate private final int _baseMpConsumeRate; private final int _baseHpConsumeRate; + /** For client info use {@link #_fCollisionRadius} */ private final int _collisionRadius; + /** For client info use {@link #_fCollisionHeight} */ private final int _collisionHeight; + private final float _fCollisionRadius; + private final float _fCollisionHeight; + public CreatureTemplate(StatSet set) { // Base stats @@ -160,8 +165,10 @@ public class CreatureTemplate _baseHpConsumeRate = set.getInt("baseHpConsumeRate", 0); // Geometry - _collisionRadius = (int) set.getFloat("collision_radius"); // TODO: Support float. - _collisionHeight = (int) set.getFloat("collision_height"); // TODO: Support float. + _fCollisionRadius = set.getFloat("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _collisionRadius = (int) _fCollisionRadius; + _collisionHeight = (int) _fCollisionHeight; } public int getBaseSTR() @@ -463,4 +470,14 @@ public class CreatureTemplate { return _collisionHeight; } + + public float getFCollisionRadius() + { + return _fCollisionRadius; + } + + public float getFCollisionHeight() + { + return _fCollisionHeight; + } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 21eca4d02d..60fb96232a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -37,6 +37,8 @@ public class PlayerTemplate extends CreatureTemplate private final int _spawnY; private final int _spawnZ; private final List _items = new ArrayList<>(); + private final float _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; private final float[] _hpTable; private final float[] _mpTable; private final float[] _cpTable; @@ -51,6 +53,8 @@ public class PlayerTemplate extends CreatureTemplate _spawnY = set.getInt("spawnY"); _spawnZ = set.getInt("spawnZ"); _classBaseLevel = set.getInt("baseLevel"); + _fCollisionRadiusFemale = set.getFloat("collision_radius_female"); + _fCollisionHeightFemale = set.getFloat("collision_height_female"); String[] item; for (String split : set.getString("items").split(";")) @@ -124,6 +128,16 @@ public class PlayerTemplate extends CreatureTemplate return _classBaseLevel; } + public float getFCollisionRadiusFemale() + { + return _fCollisionRadiusFemale; + } + + public float getFCollisionHeightFemale() + { + return _fCollisionHeightFemale; + } + public float getBaseHpMax(int level) { if (level > _hpTable.length) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 689f7979e6..49c1233d82 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -106,9 +106,8 @@ public class CharInfo extends GameServerPacket writeD(_flyWalkSpd); writeF(_moveMultiplier); writeF(_player.getAttackSpeedMultiplier()); - writeF(_player.getBaseTemplate().getCollisionRadius()); - writeF(_player.getBaseTemplate().getCollisionHeight()); - + writeF(_player.getCollisionRadius()); + writeF(_player.getCollisionHeight()); writeD(_player.getAppearance().getHairStyle()); writeD(_player.getAppearance().getHairColor()); writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 5508456b38..5a88f3afda 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -57,8 +57,8 @@ public class NpcInfo extends GameServerPacket private int _flyWalkSpd; private int _rhand; private int _lhand; - private int _collisionHeight; - private int _collisionRadius; + private float _collisionHeight; + private float _collisionRadius; protected int _clanCrest; protected int _allyCrest; protected int _allyId; @@ -86,8 +86,8 @@ public class NpcInfo extends GameServerPacket _rhand = cha.getRightHandItem(); _lhand = cha.getLeftHandItem(); _isSummoned = false; - _collisionHeight = cha.getCollisionHeight(); - _collisionRadius = cha.getCollisionRadius(); + _collisionHeight = cha.getTemplate().getFCollisionHeight(); + _collisionRadius = cha.getTemplate().getFCollisionRadius(); if (Config.SHOW_NPC_CLAN_CREST && (cha.getCastle() != null) && (cha.getCastle().getOwnerId() != 0) && !cha.isMonster() && !cha.isArtefact() && !(cha instanceof ControlTowerInstance)) { @@ -174,8 +174,8 @@ public class NpcInfo extends GameServerPacket _rhand = 0; _lhand = 0; _isSummoned = cha.isShowSummonAnimation(); - _collisionHeight = _creature.getTemplate().getCollisionHeight(); - _collisionRadius = _creature.getTemplate().getCollisionRadius(); + _collisionHeight = _creature.getTemplate().getFCollisionHeight(); + _collisionRadius = _creature.getTemplate().getFCollisionRadius(); if (cha.getTemplate().isServerSideName() || (cha instanceof PetInstance) || (cha instanceof SummonInstance)) { _name = _creature.getName(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index eee31653c6..66bbc81c66 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -107,8 +107,8 @@ public class PetInfo extends GameServerPacket writeF(1/* _cha.getProperMultiplier() */); writeF(1/* _cha.getAttackSpeedMultiplier() */); - writeF(_summon.getTemplate().getCollisionRadius()); - writeF(_summon.getTemplate().getCollisionHeight()); + writeF(_summon.getTemplate().getFCollisionRadius()); + writeF(_summon.getTemplate().getFCollisionHeight()); writeD(0); // right hand weapon writeD(0); writeD(0); // left hand weapon diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 1b671e20db..bdd7632551 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -18,7 +18,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -155,19 +154,8 @@ public class UserInfo extends GameServerPacket writeD(_flyWalkSpd); writeF(_player.getMovementSpeedMultiplier()); // run speed multiplier writeF(_player.getAttackSpeedMultiplier()); // attack speed multiplier - - final Summon pet = _player.getPet(); - if ((_player.getMountType() != 0) && (pet != null)) - { - writeF(pet.getTemplate().getCollisionRadius()); - writeF(pet.getTemplate().getCollisionHeight()); - } - else - { - writeF(_player.getBaseTemplate().getCollisionRadius()); - writeF(_player.getBaseTemplate().getCollisionHeight()); - } - + writeF(_player.getCollisionRadius()); + writeF(_player.getCollisionHeight()); writeD(_player.getAppearance().getHairStyle()); writeD(_player.getAppearance().getHairColor()); writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/stats/playerTemplates.xml b/L2J_Mobius_C6_Interlude/dist/game/data/stats/playerTemplates.xml index bc8bc51673..3874ab47b1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/stats/playerTemplates.xml +++ b/L2J_Mobius_C6_Interlude/dist/game/data/stats/playerTemplates.xml @@ -1,92 +1,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/xsd/playerTemplates.xsd b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/playerTemplates.xsd index dec8870f02..4e9a9defe7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/xsd/playerTemplates.xsd +++ b/L2J_Mobius_C6_Interlude/dist/game/data/xsd/playerTemplates.xsd @@ -27,7 +27,9 @@ + + diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 108451adf5..13b1b046f3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -8020,10 +8020,10 @@ public class PlayerInstance extends Playable statement.setInt(29, getAppearance().getHairStyle()); statement.setInt(30, getAppearance().getHairColor()); statement.setInt(31, getAppearance().isFemale() ? 1 : 0); - statement.setDouble(32, 1/* getMovementMultiplier() */); - statement.setDouble(33, 1/* getAttackSpeedMultiplier() */); - statement.setDouble(34, getTemplate().getCollisionRadius()); - statement.setDouble(35, getTemplate().getCollisionHeight()); + statement.setDouble(32, 1 /* getMovementMultiplier() */); + statement.setDouble(33, 1 /* getAttackSpeedMultiplier() */); + statement.setDouble(34, getCollisionRadius()); + statement.setDouble(35, getCollisionHeight()); statement.setLong(36, getExp()); statement.setInt(37, getSp()); statement.setInt(38, getKarma()); @@ -15751,6 +15751,24 @@ public class PlayerInstance extends Playable _offlineShopStart = time; } + public float getCollisionRadius() + { + if (isMounted() && (_summon != null)) + { + return _summon.getTemplate().getCollisionRadius(); + } + return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); + } + + public float getCollisionHeight() + { + if (isMounted() && (_summon != null)) + { + return _summon.getTemplate().getCollisionHeight(); + } + return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); + } + /** * Return true if character falling now On the start of fall return false for correct coord sync !. * @param z the z diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 75bf44b864..ef9f68cd8c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -90,9 +90,14 @@ public class CreatureTemplate private final int _baseMpConsumeRate; private final int _baseHpConsumeRate; + /** For client info use {@link #_fCollisionRadius} */ private final int _collisionRadius; + /** For client info use {@link #_fCollisionHeight} */ private final int _collisionHeight; + private final float _fCollisionRadius; + private final float _fCollisionHeight; + public CreatureTemplate(StatSet set) { // Base stats @@ -160,8 +165,10 @@ public class CreatureTemplate _baseHpConsumeRate = set.getInt("baseHpConsumeRate", 0); // Geometry - _collisionRadius = (int) set.getFloat("collision_radius"); // TODO: Support float. - _collisionHeight = (int) set.getFloat("collision_height"); // TODO: Support float. + _fCollisionRadius = set.getFloat("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _collisionRadius = (int) _fCollisionRadius; + _collisionHeight = (int) _fCollisionHeight; } public int getBaseSTR() @@ -463,4 +470,14 @@ public class CreatureTemplate { return _collisionHeight; } + + public float getFCollisionRadius() + { + return _fCollisionRadius; + } + + public float getFCollisionHeight() + { + return _fCollisionHeight; + } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 21eca4d02d..60fb96232a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -37,6 +37,8 @@ public class PlayerTemplate extends CreatureTemplate private final int _spawnY; private final int _spawnZ; private final List _items = new ArrayList<>(); + private final float _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; private final float[] _hpTable; private final float[] _mpTable; private final float[] _cpTable; @@ -51,6 +53,8 @@ public class PlayerTemplate extends CreatureTemplate _spawnY = set.getInt("spawnY"); _spawnZ = set.getInt("spawnZ"); _classBaseLevel = set.getInt("baseLevel"); + _fCollisionRadiusFemale = set.getFloat("collision_radius_female"); + _fCollisionHeightFemale = set.getFloat("collision_height_female"); String[] item; for (String split : set.getString("items").split(";")) @@ -124,6 +128,16 @@ public class PlayerTemplate extends CreatureTemplate return _classBaseLevel; } + public float getFCollisionRadiusFemale() + { + return _fCollisionRadiusFemale; + } + + public float getFCollisionHeightFemale() + { + return _fCollisionHeightFemale; + } + public float getBaseHpMax(int level) { if (level > _hpTable.length) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 9bcad56232..ba6f29998c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -132,9 +132,8 @@ public class CharInfo extends GameServerPacket writeD(_flyWalkSpd); writeF(_moveMultiplier); writeF(_player.getAttackSpeedMultiplier()); - writeF(_player.getBaseTemplate().getCollisionRadius()); - writeF(_player.getBaseTemplate().getCollisionHeight()); - + writeF(_player.getCollisionRadius()); + writeF(_player.getCollisionHeight()); writeD(_player.getAppearance().getHairStyle()); writeD(_player.getAppearance().getHairColor()); writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 9c531738d8..5411eb0c39 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -57,8 +57,8 @@ public class NpcInfo extends GameServerPacket private int _flyWalkSpd; private int _rhand; private int _lhand; - private int _collisionHeight; - private int _collisionRadius; + private float _collisionHeight; + private float _collisionRadius; protected int _clanCrest; protected int _allyCrest; protected int _allyId; @@ -86,8 +86,8 @@ public class NpcInfo extends GameServerPacket _rhand = cha.getRightHandItem(); _lhand = cha.getLeftHandItem(); _isSummoned = false; - _collisionHeight = cha.getCollisionHeight(); - _collisionRadius = cha.getCollisionRadius(); + _collisionHeight = cha.getTemplate().getFCollisionHeight(); + _collisionRadius = cha.getTemplate().getFCollisionRadius(); if (Config.SHOW_NPC_CLAN_CREST && (cha.getCastle() != null) && (cha.getCastle().getOwnerId() != 0) && !cha.isMonster() && !cha.isArtefact() && !(cha instanceof ControlTowerInstance)) { @@ -174,8 +174,8 @@ public class NpcInfo extends GameServerPacket _rhand = 0; _lhand = 0; _isSummoned = cha.isShowSummonAnimation(); - _collisionHeight = _creature.getTemplate().getCollisionHeight(); - _collisionRadius = _creature.getTemplate().getCollisionRadius(); + _collisionHeight = _creature.getTemplate().getFCollisionHeight(); + _collisionRadius = _creature.getTemplate().getFCollisionRadius(); if (cha.getTemplate().isServerSideName() || (cha instanceof PetInstance) || (cha instanceof SummonInstance)) { _name = _creature.getName(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index eee31653c6..66bbc81c66 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -107,8 +107,8 @@ public class PetInfo extends GameServerPacket writeF(1/* _cha.getProperMultiplier() */); writeF(1/* _cha.getAttackSpeedMultiplier() */); - writeF(_summon.getTemplate().getCollisionRadius()); - writeF(_summon.getTemplate().getCollisionHeight()); + writeF(_summon.getTemplate().getFCollisionRadius()); + writeF(_summon.getTemplate().getFCollisionHeight()); writeD(0); // right hand weapon writeD(0); writeD(0); // left hand weapon diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index a3907e6ff3..e4393cb2f8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Creature; -import org.l2jmobius.gameserver.model.actor.Summon; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; @@ -192,19 +191,8 @@ public class UserInfo extends GameServerPacket writeD(_flyWalkSpd); writeF(_player.getMovementSpeedMultiplier()); // run speed multiplier writeF(_player.getAttackSpeedMultiplier()); // attack speed multiplier - - final Summon pet = _player.getPet(); - if ((_player.getMountType() != 0) && (pet != null)) - { - writeF(pet.getTemplate().getCollisionRadius()); - writeF(pet.getTemplate().getCollisionHeight()); - } - else - { - writeF(_player.getBaseTemplate().getCollisionRadius()); - writeF(_player.getBaseTemplate().getCollisionHeight()); - } - + writeF(_player.getCollisionRadius()); + writeF(_player.getCollisionHeight()); writeD(_player.getAppearance().getHairStyle()); writeD(_player.getAppearance().getHairColor()); writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index 0898eb9b36..deb70e5879 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -95,8 +95,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(((Creature) target).getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(((Creature) target).getHeading())); - html.replace("%collision_radius%", String.valueOf(((Creature) target).getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(((Creature) target).getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(((Creature) target).getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(((Creature) target).getTemplate().getFCollisionHeight())); html.replace("%loc2d%", String.valueOf((int) player.calculateDistance2D(target))); html.replace("%loc3d%", String.valueOf((int) player.calculateDistance3D(target))); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 12b3bb516c..c1e0f7d4a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -45,7 +45,7 @@ public class Grow extends AbstractEffect if (info.getEffected().isNpc()) { final Npc npc = (Npc) info.getEffected(); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java index 33da802cdc..4cc9005e0f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -180,8 +180,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); } @@ -1175,8 +1175,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7e56e7008c..78c13da32a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13412,30 +13412,30 @@ public class PlayerInstance extends Playable } } - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } if (isTransformed()) { return _transformation.getCollisionRadius(this); } - return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); } - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } if (isTransformed()) { return _transformation.getCollisionHeight(this); } - return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); } public int getClientX() diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index ad56b5c067..0ff8ac6e30 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -78,8 +78,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; private final double[] _moveType = new double[MoveType.values().length]; /** The creature's race. */ @@ -135,8 +135,8 @@ public class CreatureTemplate extends ListenersContainer _baseElementRes = set.getInt("baseElementRes", 0); // Geometry - _fCollisionHeight = set.getDouble("collisionHeight", 0); - _fCollisionRadius = set.getDouble("collisionRadius", 0); + _fCollisionHeight = set.getFloat("collisionHeight", 0); + _fCollisionRadius = set.getFloat("collisionRadius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -467,7 +467,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -475,7 +475,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 748b8213bb..6224a3bd9a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -75,8 +75,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_LFINGER, set.getInt("baseMDefrfinger", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -206,7 +206,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -214,7 +214,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 43fd5495ca..c36fd1dc0a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -183,13 +183,13 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(PlayerInstance player) + public float getCollisionHeight(PlayerInstance player) { final TransformTemplate template = getTemplate(player); return template != null ? template.getCollisionHeight() : player.getCollisionHeight(); } - public double getCollisionRadius(PlayerInstance player) + public float getCollisionRadius(PlayerInstance player) { final TransformTemplate template = getTemplate(player); return template != null ? template.getCollisionRadius() : player.getCollisionRadius(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 8c9c1e94bb..ba4493419f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final double _collisionRadius; - private final double _collisionHeight; + private final float _collisionRadius; + private final float _collisionHeight; private final WeaponType _baseAttackType; private final int _baseAttackRange; private final double _baseRandomDamage; @@ -55,8 +55,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.getDouble("radius", 0); - _collisionHeight = set.getDouble("height", 0); + _collisionRadius = set.getFloat("radius", 0); + _collisionHeight = set.getFloat("height", 0); _baseAttackType = set.getEnum("attackType", WeaponType.class, WeaponType.FIST); _baseAttackRange = set.getInt("range", 40); _baseRandomDamage = set.getDouble("randomDamage", 0); @@ -148,12 +148,12 @@ public class TransformTemplate return _baseStats.get(stat.ordinal()); } - public double getCollisionRadius() + public float getCollisionRadius() { return _collisionRadius; } - public double getCollisionHeight() + public float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java index a66b17f948..afa610e943 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java @@ -56,8 +56,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket protected int _lhand; protected int _chest; protected int _enchantEffect; - protected double _collisionHeight; - protected double _collisionRadius; + protected float _collisionHeight; + protected float _collisionRadius; protected String _name = ""; protected String _title = ""; protected final boolean _gmSeeInvis; @@ -112,8 +112,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _rhand = cha.getRightHandItem(); // On every subclass _lhand = cha.getLeftHandItem(); // On every subclass _enchantEffect = cha.getEnchantEffect(); - _collisionHeight = cha.getCollisionHeight(); // On every subclass - _collisionRadius = cha.getCollisionRadius(); // On every subclass + _collisionHeight = cha.getTemplate().getFCollisionHeight(); // On every subclass + _collisionRadius = cha.getTemplate().getFCollisionRadius(); // On every subclass _isAttackable = cha.isAutoAttackable(attacker); // npc crest of owning clan/ally of castle @@ -269,8 +269,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _isAttackable = cha.isAutoAttackable(attacker); _rhand = 0; _lhand = 0; - _collisionHeight = _trap.getTemplate().getfCollisionHeight(); - _collisionRadius = _trap.getTemplate().getfCollisionRadius(); + _collisionHeight = _trap.getTemplate().getFCollisionHeight(); + _collisionRadius = _trap.getTemplate().getFCollisionRadius(); if (cha.getTemplate().isUsingServerSideName()) { _name = cha.getName(); @@ -365,8 +365,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _name = cha.getName(); _title = (cha.getOwner() != null) && cha.getOwner().isOnline() ? cha.getOwner().getName() : ""; _displayId = cha.getTemplate().getDisplayId(); - _collisionHeight = cha.getTemplate().getfCollisionHeight(); - _collisionRadius = cha.getTemplate().getfCollisionRadius(); + _collisionHeight = cha.getTemplate().getFCollisionHeight(); + _collisionRadius = cha.getTemplate().getFCollisionRadius(); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index b4d5c69f31..5db308c079 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 7e7a2b9619..53b9965479 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -106,8 +106,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor packet.writeD(0x00); // left hand weapon diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index 0898eb9b36..deb70e5879 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -95,8 +95,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(((Creature) target).getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(((Creature) target).getHeading())); - html.replace("%collision_radius%", String.valueOf(((Creature) target).getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(((Creature) target).getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(((Creature) target).getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(((Creature) target).getTemplate().getFCollisionHeight())); html.replace("%loc2d%", String.valueOf((int) player.calculateDistance2D(target))); html.replace("%loc3d%", String.valueOf((int) player.calculateDistance3D(target))); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 12b3bb516c..c1e0f7d4a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -45,7 +45,7 @@ public class Grow extends AbstractEffect if (info.getEffected().isNpc()) { final Npc npc = (Npc) info.getEffected(); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java index 33da802cdc..4cc9005e0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -180,8 +180,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); } @@ -1175,8 +1175,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index a23a0db4b5..b5fd9a4a1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -13305,30 +13305,30 @@ public class PlayerInstance extends Playable } } - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } if (isTransformed()) { return _transformation.getCollisionRadius(this); } - return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + return _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); } - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } if (isTransformed()) { return _transformation.getCollisionHeight(this); } - return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + return _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); } public int getClientX() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index ad56b5c067..0ff8ac6e30 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -78,8 +78,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; private final double[] _moveType = new double[MoveType.values().length]; /** The creature's race. */ @@ -135,8 +135,8 @@ public class CreatureTemplate extends ListenersContainer _baseElementRes = set.getInt("baseElementRes", 0); // Geometry - _fCollisionHeight = set.getDouble("collisionHeight", 0); - _fCollisionRadius = set.getDouble("collisionRadius", 0); + _fCollisionHeight = set.getFloat("collisionHeight", 0); + _fCollisionRadius = set.getFloat("collisionRadius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -467,7 +467,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -475,7 +475,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 748b8213bb..6224a3bd9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -75,8 +75,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_LFINGER, set.getInt("baseMDefrfinger", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -206,7 +206,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -214,7 +214,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 43fd5495ca..c36fd1dc0a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -183,13 +183,13 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(PlayerInstance player) + public float getCollisionHeight(PlayerInstance player) { final TransformTemplate template = getTemplate(player); return template != null ? template.getCollisionHeight() : player.getCollisionHeight(); } - public double getCollisionRadius(PlayerInstance player) + public float getCollisionRadius(PlayerInstance player) { final TransformTemplate template = getTemplate(player); return template != null ? template.getCollisionRadius() : player.getCollisionRadius(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 8c9c1e94bb..ba4493419f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -38,8 +38,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final double _collisionRadius; - private final double _collisionHeight; + private final float _collisionRadius; + private final float _collisionHeight; private final WeaponType _baseAttackType; private final int _baseAttackRange; private final double _baseRandomDamage; @@ -55,8 +55,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.getDouble("radius", 0); - _collisionHeight = set.getDouble("height", 0); + _collisionRadius = set.getFloat("radius", 0); + _collisionHeight = set.getFloat("height", 0); _baseAttackType = set.getEnum("attackType", WeaponType.class, WeaponType.FIST); _baseAttackRange = set.getInt("range", 40); _baseRandomDamage = set.getDouble("randomDamage", 0); @@ -148,12 +148,12 @@ public class TransformTemplate return _baseStats.get(stat.ordinal()); } - public double getCollisionRadius() + public float getCollisionRadius() { return _collisionRadius; } - public double getCollisionHeight() + public float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java index 8be062184f..1dce54de50 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java @@ -56,8 +56,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket protected int _lhand; protected int _chest; protected int _enchantEffect; - protected double _collisionHeight; - protected double _collisionRadius; + protected float _collisionHeight; + protected float _collisionRadius; protected String _name = ""; protected String _title = ""; protected final boolean _gmSeeInvis; @@ -112,8 +112,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _rhand = cha.getRightHandItem(); // On every subclass _lhand = cha.getLeftHandItem(); // On every subclass _enchantEffect = cha.getEnchantEffect(); - _collisionHeight = cha.getCollisionHeight(); // On every subclass - _collisionRadius = cha.getCollisionRadius(); // On every subclass + _collisionHeight = cha.getTemplate().getFCollisionHeight(); // On every subclass + _collisionRadius = cha.getTemplate().getFCollisionRadius(); // On every subclass _isAttackable = cha.isAutoAttackable(attacker); // npc crest of owning clan/ally of castle @@ -271,8 +271,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _isAttackable = cha.isAutoAttackable(attacker); _rhand = 0; _lhand = 0; - _collisionHeight = _trap.getTemplate().getfCollisionHeight(); - _collisionRadius = _trap.getTemplate().getfCollisionRadius(); + _collisionHeight = _trap.getTemplate().getFCollisionHeight(); + _collisionRadius = _trap.getTemplate().getFCollisionRadius(); if (cha.getTemplate().isUsingServerSideName()) { _name = cha.getName(); @@ -369,8 +369,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _name = cha.getName(); _title = (cha.getOwner() != null) && cha.getOwner().isOnline() ? cha.getOwner().getName() : ""; _displayId = cha.getTemplate().getDisplayId(); - _collisionHeight = cha.getTemplate().getfCollisionHeight(); - _collisionRadius = cha.getTemplate().getfCollisionRadius(); + _collisionHeight = cha.getTemplate().getFCollisionHeight(); + _collisionRadius = cha.getTemplate().getFCollisionRadius(); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index b4d5c69f31..5db308c079 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 980ac07d53..b0bd557665 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -106,8 +106,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor packet.writeD(0x00); // left hand weapon diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 56e4999036..a2d0e70628 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java index 79f6b1f42a..cfe1e9a08f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 021ba29232..6e5890e047 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12330,26 +12330,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9cbb2e6296..6931d8f311 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -929,12 +929,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 56e4999036..a2d0e70628 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java index 79f6b1f42a..cfe1e9a08f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 17a2cac279..1531170229 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12330,26 +12330,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9cbb2e6296..6931d8f311 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -929,12 +929,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index 114958df32..84c5c975fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java index 79f6b1f42a..cfe1e9a08f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5739a117b7..a88198ea9f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12316,26 +12316,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9cbb2e6296..6931d8f311 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -929,12 +929,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index d6104e785e..a6d17e3c3a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -504,15 +504,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java index 64073c04fc..43d7a7f608 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -138,8 +138,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -189,8 +189,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -911,8 +911,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1261,24 +1261,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1833a23a90..5339d5783b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12358,26 +12358,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 59452dc551..2d05ef3aae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -113,8 +113,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -201,8 +201,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -944,12 +944,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index d6104e785e..a6d17e3c3a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -504,15 +504,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java index 64073c04fc..43d7a7f608 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -138,8 +138,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -189,8 +189,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -911,8 +911,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1261,24 +1261,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 55f885dbc3..1422f65a2f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12358,26 +12358,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 59452dc551..2d05ef3aae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -113,8 +113,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -201,8 +201,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -944,12 +944,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index dd9b22a795..84b93ee8d5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -504,15 +504,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java index 64073c04fc..43d7a7f608 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -138,8 +138,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -189,8 +189,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -911,8 +911,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1261,24 +1261,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 50c234dcb7..da71bf283b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12318,26 +12318,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 59452dc551..2d05ef3aae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -113,8 +113,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -201,8 +201,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -944,12 +944,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java index d660d45698..7884ce69f2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java @@ -88,8 +88,8 @@ public class NpcActionShift implements IActionShiftHandler html.replace("%men%", String.valueOf(npc.getMEN())); html.replace("%loc%", target.getX() + " " + target.getY() + " " + target.getZ()); html.replace("%heading%", String.valueOf(npc.getHeading())); - html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getfCollisionRadius())); - html.replace("%collision_height%", String.valueOf(npc.getTemplate().getfCollisionHeight())); + html.replace("%collision_radius%", String.valueOf(npc.getTemplate().getFCollisionRadius())); + html.replace("%collision_height%", String.valueOf(npc.getTemplate().getFCollisionHeight())); html.replace("%clanHall%", clanHall != null ? clanHall.getName() : "none"); html.replace("%mpRewardValue%", npc.getTemplate().getMpRewardValue()); html.replace("%mpRewardTicks%", npc.getTemplate().getMpRewardTicks()); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 6daddd874b..067ea5f04e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -50,7 +50,7 @@ public class Grow extends AbstractEffect { final Npc npc = (Npc) effected; npc.setCollisionHeight(npc.getTemplate().getCollisionHeight()); - npc.setCollisionRadius(npc.getTemplate().getfCollisionRadius()); + npc.setCollisionRadius(npc.getTemplate().getFCollisionRadius()); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 56e4999036..a2d0e70628 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -503,15 +503,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe return _transform.filter(transform -> !transform.isStance()).map(Transform::getDisplayId).orElse(0); } - public double getCollisionRadius() + public float getCollisionRadius() { - final double defaultCollisionRadius = _template.getCollisionRadius(); + final float defaultCollisionRadius = _template.getCollisionRadius(); return _transform.map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } - public double getCollisionHeight() + public float getCollisionHeight() { - final double defaultCollisionHeight = _template.getCollisionHeight(); + final float defaultCollisionHeight = _template.getCollisionHeight(); return _transform.map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java index 79f6b1f42a..cfe1e9a08f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -137,8 +137,8 @@ public class Npc extends Creature private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions - private double _currentCollisionHeight; // used for npc grow effect skills - private double _currentCollisionRadius; // used for npc grow effect skills + private float _currentCollisionHeight; // used for npc grow effect skills + private float _currentCollisionRadius; // used for npc grow effect skills private int _soulshotamount = 0; private int _spiritshotamount = 0; @@ -188,8 +188,8 @@ public class Npc extends Creature _currentEnchant = Config.ENABLE_RANDOM_ENCHANT_EFFECT ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant(); // initialize the "current" collisions - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); setFlying(template.isFlying()); initStatusUpdateCache(); } @@ -899,8 +899,8 @@ public class Npc extends Creature // we do need to reset the weapons back to the initial template weapon. _currentLHandId = getTemplate().getLHandId(); _currentRHandId = getTemplate().getRHandId(); - _currentCollisionHeight = getTemplate().getfCollisionHeight(); - _currentCollisionRadius = getTemplate().getfCollisionRadius(); + _currentCollisionHeight = getTemplate().getFCollisionHeight(); + _currentCollisionRadius = getTemplate().getFCollisionRadius(); final Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null; _killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0; @@ -1249,24 +1249,24 @@ public class Npc extends Creature return getTemplate().isShowName(); } - public void setCollisionHeight(double height) + public void setCollisionHeight(float height) { _currentCollisionHeight = height; } - public void setCollisionRadius(double radius) + public void setCollisionRadius(float radius) { _currentCollisionRadius = radius; } @Override - public double getCollisionHeight() + public float getCollisionHeight() { return _currentCollisionHeight; } @Override - public double getCollisionRadius() + public float getCollisionRadius() { return _currentCollisionRadius; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1e704a272f..e02933a3de 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -12351,26 +12351,26 @@ public class PlayerInstance extends Playable } @Override - public double getCollisionRadius() + public float getCollisionRadius() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionRadius(); } - final double defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius(); + final float defaultCollisionRadius = _appearance.isFemale() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getFCollisionRadius(); return getTransformation().map(transform -> transform.getCollisionRadius(this, defaultCollisionRadius)).orElse(defaultCollisionRadius); } @Override - public double getCollisionHeight() + public float getCollisionHeight() { if (isMounted() && (_mountNpcId > 0)) { - return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight(); + return NpcData.getInstance().getTemplate(getMountNpcId()).getFCollisionHeight(); } - final double defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight(); + final float defaultCollisionHeight = _appearance.isFemale() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getFCollisionHeight(); return getTransformation().map(transform -> transform.getCollisionHeight(this, defaultCollisionHeight)).orElse(defaultCollisionHeight); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java index 500a2370be..29208b2b65 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/CreatureTemplate.java @@ -41,8 +41,8 @@ public class CreatureTemplate extends ListenersContainer /** For client info use {@link #_fCollisionHeight} */ private int _collisionHeight; - private double _fCollisionRadius; - private double _fCollisionHeight; + private float _fCollisionRadius; + private float _fCollisionHeight; protected final Map _baseValues = new EnumMap<>(Stat.class); @@ -116,8 +116,8 @@ public class CreatureTemplate extends ListenersContainer _baseValues.put(Stat.BASE_ATTRIBUTE_RES, set.getDouble("baseElementRes", 0)); // Geometry - _fCollisionHeight = set.getDouble("collision_height", 0); - _fCollisionRadius = set.getDouble("collision_radius", 0); + _fCollisionHeight = set.getFloat("collision_height", 0); + _fCollisionRadius = set.getFloat("collision_radius", 0); _collisionRadius = (int) _fCollisionRadius; _collisionHeight = (int) _fCollisionHeight; @@ -502,7 +502,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionRadius */ - public double getfCollisionRadius() + public float getFCollisionRadius() { return _fCollisionRadius; } @@ -510,7 +510,7 @@ public class CreatureTemplate extends ListenersContainer /** * @return the fCollisionHeight */ - public double getfCollisionHeight() + public float getFCollisionHeight() { return _fCollisionHeight; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 9cbb2e6296..6931d8f311 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -112,8 +112,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Set _ignoreClanNpcIds; private CopyOnWriteArrayList _dropListDeath; private CopyOnWriteArrayList _dropListSpoil; - private double _collisionRadiusGrown; - private double _collisionHeightGrown; + private float _collisionRadiusGrown; + private float _collisionHeightGrown; private int _mpRewardValue; private MpRewardType _mpRewardType; private int _mpRewardTicks; @@ -196,8 +196,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable _maxSkillChance = set.getInt("maxSkillChance", 15); _hitTimeFactor = set.getInt("hitTime", 100) / 100d; _hitTimeFactorSkill = set.getInt("hitTimeSkill", 100) / 100d; - _collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0); - _collisionHeightGrown = set.getDouble("collisionHeightGrown", 0); + _collisionRadiusGrown = set.getFloat("collisionRadiusGrown", 0); + _collisionHeightGrown = set.getFloat("collisionHeightGrown", 0); _mpRewardValue = set.getInt("mpRewardValue", 0); _mpRewardType = set.getEnum("mpRewardType", MpRewardType.class, MpRewardType.DIFF); _mpRewardTicks = set.getInt("mpRewardTicks", 0); @@ -929,12 +929,12 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable return null; } - public double getCollisionRadiusGrown() + public float getCollisionRadiusGrown() { return _collisionRadiusGrown; } - public double getCollisionHeightGrown() + public float getCollisionHeightGrown() { return _collisionHeightGrown; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java index 4e4f0f90a5..0b6b625b65 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/PlayerTemplate.java @@ -42,8 +42,8 @@ public class PlayerTemplate extends CreatureTemplate private final double[] _baseMpReg; private final double[] _baseCpReg; - private final double _fCollisionHeightFemale; - private final double _fCollisionRadiusFemale; + private final float _fCollisionHeightFemale; + private final float _fCollisionRadiusFemale; private final int _baseSafeFallHeight; @@ -76,8 +76,8 @@ public class PlayerTemplate extends CreatureTemplate _baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0)); _baseSlotDef.put(Inventory.PAPERDOLL_HAIR, set.getInt("basePDefhair", 0)); - _fCollisionRadiusFemale = set.getDouble("collisionFemaleradius"); - _fCollisionHeightFemale = set.getDouble("collisionFemaleheight"); + _fCollisionRadiusFemale = set.getFloat("collisionFemaleradius"); + _fCollisionHeightFemale = set.getFloat("collisionFemaleheight"); _baseSafeFallHeight = set.getInt("baseSafeFall", 333); _creationPoints = creationPoints; } @@ -207,7 +207,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision height for female characters. */ - public double getFCollisionHeightFemale() + public float getFCollisionHeightFemale() { return _fCollisionHeightFemale; } @@ -215,7 +215,7 @@ public class PlayerTemplate extends CreatureTemplate /** * @return the template collision radius for female characters. */ - public double getFCollisionRadiusFemale() + public float getFCollisionRadiusFemale() { return _fCollisionRadiusFemale; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java index 2f0bb2ed10..cdfe7b554b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/Transform.java @@ -202,7 +202,7 @@ public class Transform implements IIdentifiable return _type == TransformType.PURE_STAT; } - public double getCollisionHeight(Creature creature, double defaultCollisionHeight) + public float getCollisionHeight(Creature creature, float defaultCollisionHeight) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionHeight() != null)) @@ -212,7 +212,7 @@ public class Transform implements IIdentifiable return defaultCollisionHeight; } - public double getCollisionRadius(Creature creature, double defaultCollisionRadius) + public float getCollisionRadius(Creature creature, float defaultCollisionRadius) { final TransformTemplate template = getTemplate(creature); if ((template != null) && (template.getCollisionRadius() != null)) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java index 03a00e7c73..fc19bcbdef 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/transform/TransformTemplate.java @@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.network.serverpackets.ExBasicActionList; */ public class TransformTemplate { - private final Double _collisionRadius; - private final Double _collisionHeight; + private final Float _collisionRadius; + private final Float _collisionHeight; private final WeaponType _baseAttackType; private List _skills; private List _additionalSkills; @@ -51,8 +51,8 @@ public class TransformTemplate public TransformTemplate(StatSet set) { - _collisionRadius = set.contains("radius") ? set.getDouble("radius") : null; - _collisionHeight = set.contains("height") ? set.getDouble("height") : null; + _collisionRadius = set.contains("radius") ? set.getFloat("radius") : null; + _collisionHeight = set.contains("height") ? set.getFloat("height") : null; _baseAttackType = set.getEnum("attackType", WeaponType.class, null); if (set.contains("range")) { @@ -222,7 +222,7 @@ public class TransformTemplate /** * @return collision radius if set, {@code null} otherwise. */ - public Double getCollisionRadius() + public Float getCollisionRadius() { return _collisionRadius; } @@ -230,7 +230,7 @@ public class TransformTemplate /** * @return collision height if set, {@code null} otherwise. */ - public Double getCollisionHeight() + public Float getCollisionHeight() { return _collisionHeight; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 091a69cf4a..95f4b6f201 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -57,8 +57,8 @@ public class MonRaceInfo implements IClientOutgoingPacket packet.writeD(12080); // end X packet.writeD(181875 + (58 * (7 - i))); // end Y packet.writeD(-3566); // end Z - packet.writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height - packet.writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius + packet.writeF(_monsters[i].getTemplate().getFCollisionHeight()); // coll. height + packet.writeF(_monsters[i].getTemplate().getFCollisionRadius()); // coll. radius packet.writeD(120); // ?? unknown for (int j = 0; j < 20; j++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index 2ae54e0af3..6bed4610b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -118,8 +118,8 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier - packet.writeF(_summon.getTemplate().getfCollisionRadius()); - packet.writeF(_summon.getTemplate().getfCollisionHeight()); + packet.writeF(_summon.getTemplate().getFCollisionRadius()); + packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor