Skip to content

fix: remove bartering drop order bias by shuffling candidates (#4326) #4337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: experimental
Choose a base branch
from
Open

fix: remove bartering drop order bias by shuffling candidates (#4326) #4337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;

import javax.annotation.Nonnull;

Expand Down Expand Up @@ -38,7 +39,6 @@
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import io.github.thebusybiscuit.slimefun4.implementation.guide.CheatSheetSlimefunGuide;
import io.github.thebusybiscuit.slimefun4.implementation.guide.SurvivalSlimefunGuide;

import me.mrCookieSlime.Slimefun.api.BlockInfoConfig;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
Expand Down Expand Up @@ -282,6 +282,19 @@ public Set<ItemStack> getBarteringDrops() {
return barterDrops;
}

/**
* Returns a shuffled snapshot of the current bartering drops to avoid
* iteration order bias when evaluating random chances.
*
* @return A shuffled List of bartering drops
*/
@Nonnull
public List<ItemStack> getRandomizedBarteringDrops() {
List<ItemStack> list = new ArrayList<>(barterDrops);
Collections.shuffle(list, ThreadLocalRandom.current());
return list;
}

@Nonnull
public Set<SlimefunItem> getRadioactiveItems() {
return radioactive;
Expand Down
15 changes: 3 additions & 12 deletions ...va/io/github/thebusybiscuit/slimefun4/implementation/listeners/entity/PiglinListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.thebusybiscuit.slimefun4.implementation.listeners.entity;

import java.util.Set;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -78,21 +78,12 @@ public void onInteract(PlayerInteractEntityEvent e) {
@EventHandler
public void onPiglinDropItem(EntityDropItemEvent e) {
if (e.getEntity() instanceof Piglin) {
Set<ItemStack> drops = Slimefun.getRegistry().getBarteringDrops();

/*
* NOTE: Getting a new random number each iteration because multiple items could have the same
* % chance to drop, and if one fails all items with that number will fail.
* Getting a new random number will allow multiple items with the same % chance to drop.
*/

List<ItemStack> drops = Slimefun.getRegistry().getRandomizedBarteringDrops();

for (ItemStack is : drops) {
SlimefunItem sfi = SlimefunItem.getByItem(is);
// Check the getBarteringLootChance and compare against a random number 0-100,
// if the random number is greater then replace the item.
if (sfi instanceof PiglinBarterDrop piglinBarterDrop) {
int chance = piglinBarterDrop.getBarteringLootChance();

if (chance < 1 || chance >= 100) {
sfi.warn("The Piglin Bartering chance must be between 1-99% on item: " + sfi.getId());
} else if (chance > ThreadLocalRandom.current().nextInt(100)) {
Expand Down
Loading