Merge branch 'groups_wip' into quality_assurance

This commit is contained in:
Waverunner
2015-10-13 09:36:55 -04:00
13 changed files with 763 additions and 21 deletions
+2
View File
@@ -37,6 +37,7 @@ import resources.objects.SWGObject;
import resources.objects.building.BuildingObject;
import resources.objects.cell.CellObject;
import resources.objects.creature.CreatureObject;
import resources.objects.group.GroupObject;
import resources.objects.installation.InstallationObject;
import resources.objects.intangible.IntangibleObject;
import resources.objects.player.PlayerObject;
@@ -80,6 +81,7 @@ public final class ObjectCreator {
case "installation": return new InstallationObject(objectId);
case "ship": return new ShipObject(objectId);
case "soundobject": return new SoundObject(objectId);
case "group": return new GroupObject(objectId);
}
return null;
}