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
2024-05-27 18:36:07 -05:00
parent f28c887b92 75b68c0a8c
commit 5dee08d3ce
27 changed files with 1287 additions and 1783 deletions
@@ -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);