Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fail Safe NPCs

Browse Source
This commit is contained in:
Olof Larsson 2016-02-13 20:24:37 +01:00
parent a69b1de69e
commit e26e174837
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/massivecraft/massivecore/store/SenderColl.java
View File

@ -42,22 +42,17 @@ public class SenderColl<E extends SenderEntity<E>> extends Coll<E> implements Se
// OVERRIDE: Coll // OVERRIDE: Coll
// -------------------------------------------- // // -------------------------------------------- //
public static void denyNpc(Object oid)
{
if (MUtil.isNpc(oid)) throw new IllegalArgumentException("NPCs are not allowed: " + oid);
}
@Override @Override
public E get(Object oid) public E get(Object oid)
{ {
denyNpc(oid); if (MUtil.isNpc(oid)) return null;
return super.get(oid); return super.get(oid);
} }
@Override @Override
public E get(Object oid, boolean creative) public E get(Object oid, boolean creative)
{ {
denyNpc(oid); if (MUtil.isNpc(oid)) return null;
return super.get(oid, creative); return super.get(oid, creative);
} }