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

Prevent object creation from WarpedSpaceManager checks.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-02-16 04:05:15 +00:00
parent 49fcc2e70b
commit 11ce89604c
34 changed files with 102 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}

6
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -378,7 +378,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -450,7 +450,7 @@ public class GeoEngine
{
return false;
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(ox, oy, oz), new Location(tx, ty, tz), origin.getInstanceWorld()))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(ox, oy, oz, tx, ty, tz, origin.getInstanceWorld()))
{
return false;
}
@ -810,7 +810,7 @@ public class GeoEngine
{
return new GeoLocation(gox, goy, goz);
}
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(new Location(gox, goy, goz), new Location(gtx, gty, gtz), instance))
if (WarpedSpaceManager.getInstance().checkForWarpedSpace(gox, goy, goz, gtx, gty, gtz, instance))
{
return new GeoLocation(gox, goy, goz);
}

7
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/WarpedSpaceManager.java
View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.holders.WarpedSpaceHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
@ -52,7 +51,7 @@ public class WarpedSpaceManager
_warpedSpace.remove(creature);
}
public boolean checkForWarpedSpace(Location origin, Location destination, Instance instance)
public boolean checkForWarpedSpace(int originX, int originY, int originZ, int destinationX, int destinationY, int destinationZ, Instance instance)
{
if (_warpedSpace != null)
{
@ -64,8 +63,8 @@ public class WarpedSpaceManager
continue;
}
final int radius = creature.getTemplate().getCollisionRadius();
final boolean originInRange = Util.calculateDistance(creature, origin, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature, destination, false, false) <= (holder.getRange() + radius);
final boolean originInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), originX, originY, originZ, false, false) <= (holder.getRange() + radius);
final boolean destinationInRange = Util.calculateDistance(creature.getX(), creature.getY(), creature.getZ(), destinationX, destinationY, destinationZ, false, false) <= (holder.getRange() + radius);
return destinationInRange ? !originInRange : originInRange;
}
}