projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-03 18:13:11 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Treeku
2014-05-17 22:15:55 +01:00
parent 28ccc21d10 499e4aa877
commit 8bca0d625d
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/spawn/MobileTemplate.java
+2 -1
View File
@@ -21,6 +21,7 @@
******************************************************************************/
package services.spawn;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
@@ -59,7 +60,7 @@ public class MobileTemplate implements Cloneable {
private String meatType, milkType, boneType, hideType;
private int meatAmount, milkAmount, boneAmount, hideAmount;
private int respawnTime = 0;
private List<LootGroup> lootGroups;
private List<LootGroup> lootGroups = new ArrayList<LootGroup>();
public Vector<String> getTemplates() {
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);
}