MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Using color instead of int value.

Browse Source
This commit is contained in:
MagicBot
2023-05-15 05:48:41 -04:00
parent e4ddcdeeca
commit 3a2695703b
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/RealmMap.java
+6 -4
View File
@@ -37,11 +37,13 @@ public enum RealmMap {
// a player is currently located within.
public static int[][] _realmImageMap;
private static final HashMap<Integer, Integer> _rgbToIDMap = new HashMap<>();
private static final HashMap<Color, Integer> _rgbToIDMap = new HashMap<>();
public static int getRealmIDByRGB(int realmRGB) {
public static int getRealmIDByColor(Color color) {
return _rgbToIDMap.get(realmRGB);
int realmID = _rgbToIDMap.get(color);
return realmID;
}
@@ -60,7 +62,7 @@ public enum RealmMap {
}
public static void addToColorMap(Color color, int realmID) {
_rgbToIDMap.put(color.getRGB(), realmID);
_rgbToIDMap.put(color, realmID);
}
public static Realm getRealmForCity(City city) {
src/engine/util/MapLoader.java
+8 -8
View File
@@ -50,16 +50,16 @@ public enum MapLoader {
for (int i = 0; i < MBServerStatics.SPATIAL_HASH_BUCKETSY; i++) {
for (int j = 0; j < MBServerStatics.SPATIAL_HASH_BUCKETSX; j++) {
try {
int rgb = image.getRGB(j, i);
realmUUID = RealmMap.getRealmIDByRGB(rgb);
realmMap[j][i] = realmUUID;
bytesRead++;
Color pixelColor = new Color(image.getRGB(j, i));
realmUUID = RealmMap.getRealmIDByColor(pixelColor);
if (realmUUID != 0)
realmsWritten++;
realmMap[j][i] = realmUUID;
bytesRead++;
}catch (Exception e){
if (realmUUID != 0)
realmsWritten++;
}catch (Exception e){
continue;
}