projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into DantooineSpawns

Browse Source
This commit is contained in:
CharonInferar
2014-05-19 15:57:26 +02:00
parent 16f82b50a6 7a94d4438b
commit ac1128b00d
60 changed files with 1654 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/spawn/SpawnService.java
+2 -2
View File
@@ -100,7 +100,7 @@ public class SpawnService {
creature.setWeaponId(mobileTemplate.getCustomWeapon().getObjectID());
}*/
if(mobileTemplate.getLootGroups() != null)
if(mobileTemplate.getLootGroups() != null && !mobileTemplate.getLootGroups().isEmpty())
creature.setLootGroups(mobileTemplate.getLootGroups());
creature.setOptionsBitmask(mobileTemplate.getOptionsBitmask());
@@ -118,7 +118,7 @@ public class SpawnService {
level = mobileTemplate.getLevel();
}
if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0){
if (mobileTemplate.getMinLevel()!=0 && mobileTemplate.getMaxLevel()!=0 && level == -1){
level = (short) (mobileTemplate.getMinLevel() + (new Random().nextInt(mobileTemplate.getMaxLevel()-mobileTemplate.getMinLevel())));
creature.setLevel(level);
}