forked from MagicBane/Server
Merge branch 'lakebane-mines' into lakebane-master
# Conflicts: # src/engine/gameManager/CombatManager.java # src/engine/mobileAI/utilities/MovementUtilities.java # src/engine/net/client/ClientMessagePump.java # src/engine/net/client/msg/VendorDialogMsg.java # src/engine/objects/CharacterItemManager.java # src/engine/objects/Mine.java # src/engine/objects/PlayerCharacter.java # src/engine/objects/Warehouse.java
This commit is contained in:
@@ -357,7 +357,7 @@ public class MBServerStatics {
|
||||
public static final int COMBAT_SEND_DODGE = 20;
|
||||
public static final int COMBAT_SEND_BLOCK = 21;
|
||||
public static final int COMBAT_SEND_PARRY = 22;
|
||||
public static final short LEVELCAP = 75;
|
||||
public static final short LEVELCAP = 80;
|
||||
public static final int LEVEL_CON_WHITE = 7;
|
||||
public static final int RESPAWN_TIMER = 90 * 1000;
|
||||
public static final int DESPAWN_TIMER = 12 * 1000;
|
||||
|
||||
@@ -250,11 +250,11 @@ public class WorldServer {
|
||||
if(LocalDateTime.now().isAfter(nextDiscSpawn)) {
|
||||
switch (LocalDateTime.now().getHour()) {
|
||||
case 0:
|
||||
case 4:
|
||||
case 8:
|
||||
case 12:
|
||||
case 16:
|
||||
case 20:
|
||||
case 3:
|
||||
case 7:
|
||||
case 11:
|
||||
case 15:
|
||||
case 19:
|
||||
for (Mob dropper : Mob.disciplineDroppers) {
|
||||
if (!dropper.isAlive()) {
|
||||
Zone.respawnQue.add(dropper);
|
||||
|
||||
Reference in New Issue
Block a user