projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-28 13:12:54 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from ProjectSWGCore/master

Browse Source 
pull
This commit is contained in:
Zing
2014-09-01 11:49:58 -07:00
parent 837723a55e b0ada28769
commit fdbde00ee4
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/transferitemarmor.py
+5 -5
View File
@@ -40,13 +40,13 @@ def run(core, actor, target, commandString):
if object != None:
actor.transferTo(actor, oldContainer, object)
oldContainer.transferTo(actor, container, target)
if oldContainer == actor.getSlottedObject('appearance_inventory'):
actor.removeObjectFromAppearanceEquipList(target)
oldContainer.transferTo(actor, container, target)
if container == actor.getSlottedObject('appearance_inventory'):
actor.addObjectToAppearanceEquipList(target)
return
scripts/commands/transferitemmisc.py
+4 -4
View File
@@ -78,13 +78,13 @@ def run(core, actor, target, commandString):
if object != None:
container.transferTo(actor, container, object)
oldContainer.transferTo(actor, container, target)
if oldContainer == actor.getSlottedObject('appearance_inventory'):
actor.removeObjectFromAppearanceEquipList(target)
oldContainer.transferTo(actor, container, target)
if container == actor.getSlottedObject('appearance_inventory'):
actor.addObjectToAppearanceEquipList(target)
actor.addObjectToAppearanceEquipList(target)
return
src/resources/objects/SWGList.java
+2 -2
View File
@@ -233,7 +233,7 @@ public class SWGList<E> extends Delta implements List<E> {
int index = list.indexOf(o);
if (list.remove(o)) {
queue(item(1, index, null, true, false));
queue(item(0, index, null, true, false));
return true;
} else {
return false;
@@ -245,7 +245,7 @@ public class SWGList<E> extends Delta implements List<E> {
synchronized(objectMutex) {
E element = list.remove(index);
queue(item(1, index, null, true, false));
queue(item(0, index, null, true, false));
return (E) element;
}
src/services/spawn/SpawnService.java
+7 -7
View File
@@ -106,8 +106,8 @@ public class SpawnService {
/*if(mobileTemplate.getCustomWeapon() != null) {
creature.addObjectToEquipList(mobileTemplate.getCustomWeapon());
creature.add(mobileTemplate.getCustomWeapon());
creature.addObjectToEquipList(mobileTemplate.getCustomWeapon());
creature.setWeaponId(mobileTemplate.getCustomWeapon().getObjectID());
}*/
@@ -183,12 +183,12 @@ public class SpawnService {
defaultWeapon.setMinDamage(creature.getLevel() * 22);
}
creature.addObjectToEquipList(defaultWeapon);
creature.add(defaultWeapon);
creature.addObjectToEquipList(defaultWeapon);
creature.setWeaponId(defaultWeapon.getObjectID());
creature.addObjectToEquipList(inventory);
creature.add(inventory);
creature.addObjectToEquipList(inventory);
int customHealth = mobileTemplate.getHealth();
if(difficulty > 0 && customHealth == 0) {
if(difficulty == 1) {
@@ -282,8 +282,8 @@ public class SpawnService {
/*if(mobileTemplate.getCustomWeapon() != null) {
creature.addObjectToEquipList(mobileTemplate.getCustomWeapon());
creature.add(mobileTemplate.getCustomWeapon());
creature.addObjectToEquipList(mobileTemplate.getCustomWeapon());
creature.setWeaponId(mobileTemplate.getCustomWeapon().getObjectID());
}*/
@@ -368,11 +368,11 @@ public class SpawnService {
defaultWeapon.setMinDamage(creature.getLevel() * 22);
}
creature.addObjectToEquipList(defaultWeapon);
creature.add(defaultWeapon);
creature.addObjectToEquipList(defaultWeapon);
creature.setWeaponId(defaultWeapon.getObjectID());
creature.addObjectToEquipList(inventory);
creature.add(inventory);
creature.addObjectToEquipList(inventory);
int customHealth = mobileTemplate.getHealth();
if(difficulty > 0 && customHealth == 0) {