projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-30 00:15:50 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into awareness

Browse Source
This commit is contained in:
Waverunner
2014-12-18 09:59:15 -05:00
parent 98fb3d9ded a007e51d05
commit b30d162476
16 changed files with 432 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+4 -1
View File
@@ -28,7 +28,6 @@ import resources.Terrain;
import resources.client_info.ClientFactory;
import resources.client_info.visitors.ObjectData;
import resources.client_info.visitors.SlotArrangementData;
import resources.client_info.visitors.SlotDefinitionData;
import resources.client_info.visitors.SlotDescriptorData;
import resources.control.Intent;
import resources.control.Manager;
@@ -311,4 +310,8 @@ public class ObjectManager extends Manager {
private WeaponObject createWeaponObject(long objectId, String template) {
return new WeaponObject(objectId);
}
public SWGObject getObjectById(long id) {
return objects.get(id);
}
}