Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

various cleanups

Browse Source
This commit is contained in:
fatboy
2024-04-23 05:44:32 -05:00
parent 928845a220
commit 9879c1b18f
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/LootManager.java
+11 -15
View File
@@ -101,18 +101,6 @@ public enum LootManager {
chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID()); chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(chatMsg); DispatchMessage.dispatchMsgToAll(chatMsg);
} }
if (ib.isDiscRune() && mob.level < 80){
if(Mob.disciplineDroppers.contains(mob) == false){
Mob.disciplineDroppers.add(mob);
}
mob.level = 60;
mob.healthMax = 7500;
mob.setHealth(7500);
ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " may have found the " + ib.getName() + ". Are you tough enough to take it?");
chatMsg.setMessageType(10);
chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(chatMsg);
}
} }
} }
@@ -458,14 +446,22 @@ public enum LootManager {
if(bse.itemBase == 3049)//disable clanwarden if(bse.itemBase == 3049)//disable clanwarden
return; return;
int chance = 25; int chance;
if(ItemBase.getItemBase(bse.itemBase).isDiscRune() == false) { if(!ItemBase.getItemBase(bse.itemBase).isDiscRune()) {
chance = (int) bse.dropChance; chance = (int) bse.dropChance;
}else { }else {
chance = 25; chance = 25;
if(Mob.disciplineDroppers.contains(mob) == false) if(!Mob.disciplineDroppers.contains(mob))
Mob.disciplineDroppers.add(mob); Mob.disciplineDroppers.add(mob);
mob.level = 60;
mob.healthMax = 7500;
mob.setHealth(7500);
ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " may have found the " + ItemBase.getItemBase(bse.itemBase).getName() + ". Are you tough enough to take it?");
chatMsg.setMessageType(10);
chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(chatMsg);
} }
//if((bse.itemBase == 3040 || bse.itemBase == 3021) && mob.level < 80){ //if((bse.itemBase == 3040 || bse.itemBase == 3021) && mob.level < 80){
src/engine/mobileAI/MobAI.java
+2 -2
View File
@@ -907,9 +907,9 @@ public class MobAI {
} }
} }
} }
} else if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000))) { } else if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000L))) {
if (Zone.respawnQue.contains(aiAgent) == false && Mob.disciplineDroppers.contains(aiAgent) == false){ if (!Zone.respawnQue.contains(aiAgent) && !Mob.disciplineDroppers.contains(aiAgent)){
Zone.respawnQue.add(aiAgent); Zone.respawnQue.add(aiAgent);
} }
} }
src/engine/server/world/WorldServer.java
+1 -6
View File
@@ -240,12 +240,7 @@ public class WorldServer {
Thread hourlyJobThread = new Thread(new HourlyJobThread()); Thread hourlyJobThread = new Thread(new HourlyJobThread());
hourlyJobThread.setName("hourlyJob"); hourlyJobThread.setName("hourlyJob");
hourlyJobThread.start(); hourlyJobThread.start();
//if(LocalDateTime.now().isAfter(LocalDateTime.now().withMinute(30).withSecond(0))) { nextHourlyJobTime = nextHourlyJobTime.plusMinutes(60);
// nextHourlyJobTime = LocalDateTime.now().withMinute(0).withSecond(0).plusHours(1);
//}else{
// nextHourlyJobTime = LocalDateTime.now().withMinute(30).withSecond(0);
//}
nextHourlyJobTime = nextHourlyJobTime.plusMinutes(30);
} }
if (LocalDateTime.now().isAfter(nextWareHousePushTime)) { if (LocalDateTime.now().isAfter(nextWareHousePushTime)) {