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

Removed instance getter from InstanceWorld.

Browse Source
This commit is contained in:
MobiusDev
2018-04-30 02:24:41 +00:00
parent fa2d194ac8
commit dca612dbb5
21 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInstanceId.java
View File

@@ -55,6 +55,6 @@ public class ConditionPlayerInstanceId extends Condition
}
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(effector.getActingPlayer());
return (world != null) && (world.getInstanceId() == instanceId) && _instanceIds.contains(world.getInstance().getTemplateId());
return (world != null) && (world.getInstanceId() == instanceId) && _instanceIds.contains(world.getTemplateId());
}
}

18
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
View File

@@ -47,15 +47,6 @@ public class InstanceWorld
_instance = instance;
}
/**
* Gets the instance.
* @return the instance
*/
public Instance getInstance()
{
return _instance;
}
/**
* Gets the dynamically generated instance ID.
* @return the instance ID
@@ -65,6 +56,15 @@ public class InstanceWorld
return _instance.getId();
}
/**
* Get template ID of instance world.
* @return instance template ID
*/
public int getTemplateId()
{
return _instance.getTemplateId();
}
public List<Integer> getAllowed()
{
return _allowed;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/L2ZoneType.java
View File

@@ -202,7 +202,7 @@ public abstract class L2ZoneType extends ListenersContainer
if (_instanceTemplateId > 0)
{
final InstanceWorld world = InstanceManager.getInstance().getWorld(character);
if ((world != null) && (world.getInstance().getTemplateId() != _instanceTemplateId))
if ((world != null) && (world.getTemplateId() != _instanceTemplateId))
{
return false;
}