Global monster drops are retrieved from DropProvider (postgres db)

src/main/java/database/drop/DropProvider.java

@@ -38,7 +38,14 @@ public class DropProvider {
                 monsterDrop.maxQuantity(), questId);
     }
 
-    public List<MonsterGlobalDropEntry> getGlobalDropEntries() {
+    public List<MonsterGlobalDropEntry> getRelevantGlobalDrops(int mapId) {
+        int continentId = mapId / 100_000_000;
+        return getGlobalDropEntries().stream()
+                .filter(drop -> drop.continentid < 0 || drop.continentid == continentId)
+                .toList();
+    }
+
+    private List<MonsterGlobalDropEntry> getGlobalDropEntries() {
         if (this.globalMonsterDrops == null) {
             loadGlobalDrops();
         }

src/main/java/server/life/MonsterInformationProvider.java

@@ -46,7 +46,6 @@ public class MonsterInformationProvider {
         return instance;
     }
 
-    private final Map<Integer, List<MonsterDropEntry>> drops = new HashMap<>();
     private final List<MonsterGlobalDropEntry> globaldrops = new ArrayList<>();
     private final Map<Integer, List<MonsterGlobalDropEntry>> continentdrops = new HashMap<>();
 
@@ -179,7 +178,6 @@ public class MonsterInformationProvider {
     }
 
     public final void clearDrops() {
-        drops.clear();
         globaldrops.clear();
         continentdrops.clear();
         retrieveGlobal();

src/main/java/server/maps/MapleMap.java

@@ -729,8 +729,7 @@ public class MapleMap {
             chRate = 1;
         }
 
-        final MonsterInformationProvider mi = MonsterInformationProvider.getInstance();
-        final List<MonsterGlobalDropEntry> globalEntry = mi.getRelevantGlobalDrops(this.getId());
+        final List<MonsterGlobalDropEntry> globalEntry = dropProvider.getRelevantGlobalDrops(this.getId());
 
         final List<MonsterDropEntry> dropEntry = new ArrayList<>();
         final List<MonsterDropEntry> visibleQuestEntry = new ArrayList<>();

src/test/java/database/drop/DropProviderTest.java

@@ -6,6 +6,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import server.life.MonsterDropEntry;
 import server.life.MonsterGlobalDropEntry;
+import testutil.Any;
 
 import java.util.Collections;
 import java.util.List;
@@ -82,8 +83,8 @@ class DropProviderTest {
         GlobalMonsterDrop globalDrop = new GlobalMonsterDrop(2049100, -1, 2, 3, null, 450);
         when(dropDao.getGlobalMonsterDrops()).thenReturn(List.of(globalDrop));
 
-        List<MonsterGlobalDropEntry> dropEntries1 = dropProvider.getGlobalDropEntries();
-        List<MonsterGlobalDropEntry> dropEntries2 = dropProvider.getGlobalDropEntries();
+        List<MonsterGlobalDropEntry> dropEntries1 = dropProvider.getRelevantGlobalDrops(Any.integer());
+        List<MonsterGlobalDropEntry> dropEntries2 = dropProvider.getRelevantGlobalDrops(Any.integer());
 
         assertEquals(1, dropEntries1.size());
         assertEquals(1, dropEntries2.size());
@@ -104,6 +105,28 @@ class DropProviderTest {
         verify(dropDao, times(1)).getGlobalMonsterDrops();
     }
 
+    @Test
+    void getRelevantGlobalDrop() {
+        GlobalMonsterDrop ossyriaDrop = new GlobalMonsterDrop(Any.integer(), 2, Any.integer(), Any.integer(), Any.integer(), Any.integer());
+        when(dropDao.getGlobalMonsterDrops()).thenReturn(List.of(ossyriaDrop));
+        int ossyriaMapId = 200_000_200;
+
+        List<MonsterGlobalDropEntry> dropEntries = dropProvider.getRelevantGlobalDrops(ossyriaMapId);
+
+        assertEquals(1, dropEntries.size());
+    }
+
+    @Test
+    void getRelevantGlobalDrop_wrongContinent() {
+        GlobalMonsterDrop ellinDrop = new GlobalMonsterDrop(Any.integer(), 3, Any.integer(), Any.integer(), Any.integer(), Any.integer());
+        when(dropDao.getGlobalMonsterDrops()).thenReturn(List.of(ellinDrop));
+        int victoriaMapId = 102_000_000;
+
+        List<MonsterGlobalDropEntry> dropEntries = dropProvider.getRelevantGlobalDrops(victoriaMapId);
+
+        assertTrue(dropEntries.isEmpty());
+    }
+
     // TODO: add tests for getRandomStealDrop() once ItemInformationProvider is able to be mocked.
     // Currently, it does database calls (and a bunch of other stuff) in the constructor, which is problematic.
 }

src/test/java/database/maker/MakerInfoProviderTest.java

@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import server.MakerItemFactory;
-import testutil.AnyValues;
+import testutil.Any;
 import tools.Pair;
 
 import java.util.List;
@@ -80,7 +80,7 @@ class MakerInfoProviderTest {
     void getRecipeFromDb_notFound() {
         givenNoRecipe();
 
-        Optional<MakerRecipe> recipe = makerInfoProvider.getMakerRecipe(AnyValues.integer());
+        Optional<MakerRecipe> recipe = makerInfoProvider.getMakerRecipe(Any.integer());
 
         assertTrue(recipe.isEmpty());
     }
@@ -111,7 +111,7 @@ class MakerInfoProviderTest {
         MakerRecipe recipeWithCatalyst = new MakerRecipe(0, (short) 0, (short) 0, (short) 0, 0, null, null, catalyst, (short) 0, (short) 0);
         when(makerDao.getRecipe(anyInt())).thenReturn(Optional.of(recipeWithCatalyst));
 
-        Optional<Integer> stimulant = makerInfoProvider.getStimulant(AnyValues.integer());
+        Optional<Integer> stimulant = makerInfoProvider.getStimulant(Any.integer());
 
         assertTrue(stimulant.isPresent());
         assertEquals(catalyst, stimulant.get());
@@ -121,7 +121,7 @@ class MakerInfoProviderTest {
     void getStimulant_noRecipe() {
         givenNoRecipe();
 
-        Optional<Integer> stimulant = makerInfoProvider.getStimulant(AnyValues.integer());
+        Optional<Integer> stimulant = makerInfoProvider.getStimulant(Any.integer());
 
         assertTrue(stimulant.isEmpty());
     }

src/test/java/service/NoteServiceTest.java

@@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import testutil.Any;
 import testutil.Mocks;
 
 import java.util.Collections;
@@ -17,8 +18,7 @@ import java.util.Optional;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
-import static testutil.AnyValues.daoException;
-import static testutil.AnyValues.string;
+import static testutil.Any.daoException;
 
 class NoteServiceTest {
 
@@ -73,7 +73,7 @@ class NoteServiceTest {
     void sendFailure() {
         doThrow(daoException()).when(noteDao).save(any());
 
-        boolean success = noteService.sendNormal(string(), string(), string());
+        boolean success = noteService.sendNormal(Any.string(), Any.string(), Any.string());
 
         assertFalse(success);
         verify(noteDao).save(any());
@@ -139,4 +139,4 @@ class NoteServiceTest {
 
         assertTrue(deletedNote.isEmpty());
     }
-}
+}

src/test/java/testutil/Any.java

@@ -2,7 +2,7 @@ package testutil;
 
 import database.DaoException;
 
-public class AnyValues {
+public class Any {
 
     public static String string() {
         return "string";