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

Fixed #650 and #651

Browse Source
This commit is contained in:
Seefo
2014-05-11 14:12:16 -04:00
parent c47ddf77df
commit fd524a5a75
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+4 -1
View File
@@ -121,6 +121,7 @@ import resources.objects.tangible.TangibleObject;
import resources.objects.tool.SurveyTool;
import resources.objects.waypoint.WaypointObject;
import resources.objects.weapon.WeaponObject;
import services.EquipmentService;
import services.ai.AIActor;
import services.command.BaseSWGCommand;
import services.command.CombatCommand;
@@ -457,7 +458,7 @@ public class ObjectService implements INetworkDispatch {
return;
}
if (object.getAttachment("AI") != null && ((AIActor) object.getAttachment("AI")).getMobileTemplate().getRespawnTime() > 0) {
if (object.getAttachment("AI") != null && object.getAttachment("AI") instanceof AIActor && ((AIActor) object.getAttachment("AI")).getMobileTemplate().getRespawnTime() > 0) {
final long objectId = object.getObjectID();
final String Template = object.getTemplate();
final Planet planet = object.getPlanet();
@@ -501,6 +502,8 @@ public class ObjectService implements INetworkDispatch {
if(parent != null) {
if(parent instanceof CreatureObject) {
core.equipmentService.unequip((CreatureObject) parent, object);
((CreatureObject) parent).removeObjectFromEquipList(object);
((CreatureObject) parent).removeObjectFromAppearanceEquipList(object);
}