Skip to content

Theoretically fix rare Wandering Trader crash. #201

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
eehunter wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Theoretically fix rare Wandering Trader crash. #201

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
6 changes: 3 additions & 3 deletions common/src/main/kotlin/com/ssblur/scriptor/trade/ScriptorTrades.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.ssblur.scriptor.item.ScriptorItems.TOME_TIER3
import com.ssblur.scriptor.item.ScriptorItems.TOME_TIER4
import com.ssblur.scriptor.villagers.ScriptorVillagers
import com.ssblur.unfocused.entity.Trades.registerVillagerTrade
import net.minecraft.world.entity.npc.Villager
import net.minecraft.world.entity.npc.AbstractVillager
import net.minecraft.world.entity.npc.VillagerTrades
import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack
Expand Down Expand Up @@ -57,7 +57,7 @@ object ScriptorTrades {
ItemStack(Items.PURPLE_WOOL, 3),
ItemStack(Items.GOLD_NUGGET, 4)
).filter {
it.item !in (villager as Villager).offers.map { o -> o.result.item }
it.item !in (villager as AbstractVillager).offers.map { o -> o.result.item }
&& it.item !in villager.offers.map { o -> o.itemCostA.item.value() }
}
val material = materials[randomSource.nextInt(materials.size)]
Expand All @@ -73,7 +73,7 @@ object ScriptorTrades {
ItemStack(Items.PURPLE_WOOL, 3),
ItemStack(Items.GOLD_NUGGET, 4)
).filter {
it.item !in (villager as Villager).offers.map { o -> o.result.item }
it.item !in (villager as AbstractVillager).offers.map { o -> o.result.item }
&& it.item !in villager.offers.map { o -> o.itemCostA.item.value() }
}
val material = materials[randomSource.nextInt(materials.size)]
Expand Down