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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
trunk/java/com/l2jmobius/gameserver/model/L2Object.java
View File

@ -553,11 +553,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
@SuppressWarnings("unchecked")
public final <T> T removeScript(Class<T> script)
{
if (_scripts == null)
{
return null;
}
return (T) _scripts.remove(script.getName());
return _scripts == null ? null : (T) _scripts.remove(script.getName());
}
/**
@ -568,11 +564,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
@SuppressWarnings("unchecked")
public final <T> T getScript(Class<T> script)
{
if (_scripts == null)
{
return null;
}
return (T) _scripts.get(script.getName());
return _scripts == null ? null : (T) _scripts.get(script.getName());
}
public void removeStatusListener(L2Character object)
@ -629,15 +621,15 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
}
final L2WorldRegion newRegion = L2World.getInstance().getRegion(getLocation());
if (newRegion != getWorldRegion())
if (newRegion == getWorldRegion())
{
getWorldRegion().removeVisibleObject(this);
setWorldRegion(newRegion);
// Add the L2Oject spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion
getWorldRegion().addVisibleObject(this);
return;
}
getWorldRegion().removeVisibleObject(this);
setWorldRegion(newRegion);
// Add the L2Oject spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion
getWorldRegion().addVisibleObject(this);
}
public final L2WorldRegion getWorldRegion()
@ -971,13 +963,9 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
final DeleteObject deletePacket = new DeleteObject(this);
for (L2Object obj : getKnownList().getKnownObjects().values())
{
if ((obj != null) && obj.isPlayer())
if ((obj != null) && obj.isPlayer() && !isVisibleFor(obj.getActingPlayer()))
{
final L2PcInstance player = obj.getActingPlayer();
if (!isVisibleFor(player))
{
obj.sendPacket(deletePacket);
}
obj.sendPacket(deletePacket);
}
}
}