Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix global drops not dropping

Browse Source 
No longer able to shuffle the list since DropProvider
return an unmodifiable list in the case of global drops.
This commit is contained in:
P0nk
2023-08-04 15:23:02 +02:00
parent 05b7ec77c8
commit 02d4ff524a
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/server/maps/MapleMap.java
View File

@@ -632,17 +632,19 @@ public class MapleMap {
} }
} }
private byte dropItemsFromMonsterOnMap(List<MonsterDropEntry> dropEntry, Point pos, byte d, int chRate, byte droptype, int mobpos, Character chr, Monster mob) { private byte dropItemsFromMonsterOnMap(List<MonsterDropEntry> dropEntries, Point pos, byte d, int chRate,
if (dropEntry.isEmpty()) { byte droptype, int mobpos, Character chr, Monster mob) {
if (dropEntries.isEmpty()) {
return d; return d;
} }
Collections.shuffle(dropEntry); List<MonsterDropEntry> shuffledDropEntries = new ArrayList<>(dropEntries);
Collections.shuffle(shuffledDropEntries);
Item idrop; Item idrop;
ItemInformationProvider ii = ItemInformationProvider.getInstance(); ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (final MonsterDropEntry de : dropEntry) { for (final MonsterDropEntry de : shuffledDropEntries) {
float cardRate = chr.getCardRate(de.itemId); float cardRate = chr.getCardRate(de.itemId);
int dropChance = (int) Math.min((float) de.chance * chRate * cardRate, Integer.MAX_VALUE); int dropChance = (int) Math.min((float) de.chance * chRate * cardRate, Integer.MAX_VALUE);
@@ -681,13 +683,19 @@ public class MapleMap {
return d; return d;
} }
private byte dropGlobalItemsFromMonsterOnMap(List<MonsterGlobalDropEntry> globalEntry, Point pos, byte d, byte droptype, int mobpos, Character chr, Monster mob) { private byte dropGlobalItemsFromMonsterOnMap(List<MonsterGlobalDropEntry> globalDropEntries, Point pos, byte d,
Collections.shuffle(globalEntry); byte droptype, int mobpos, Character chr, Monster mob) {
if (globalDropEntries.isEmpty()) {
return d;
}
List<MonsterGlobalDropEntry> shuffledGlobalDropEntries = new ArrayList<>(globalDropEntries);
Collections.shuffle(shuffledGlobalDropEntries);
Item idrop; Item idrop;
ItemInformationProvider ii = ItemInformationProvider.getInstance(); ItemInformationProvider ii = ItemInformationProvider.getInstance();
for (final MonsterGlobalDropEntry de : globalEntry) { for (final MonsterGlobalDropEntry de : shuffledGlobalDropEntries) {
if (Randomizer.nextInt(999999) < de.chance) { if (Randomizer.nextInt(999999) < de.chance) {
if (droptype == 3) { if (droptype == 3) {
pos.x = mobpos + (d % 2 == 0 ? (40 * (d + 1) / 2) : -(40 * (d / 2))); pos.x = mobpos + (d % 2 == 0 ? (40 * (d + 1) / 2) : -(40 * (d / 2)));