SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

SPIGOT-6901: Add Support for Random in methods for LootTable

Quellcode durchsuchen 
By: Doc <nachito94@msn.com>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2022-01-17 10:09:52 +11:00
Ursprung ce2ac2868b
Commit 4c024e72f9
1 geänderte Dateien mit 6 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

9
paper-server/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
Datei anzeigen

@ -41,7 +41,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
@Override @Override
public Collection<ItemStack> populateLoot(Random random, LootContext context) { public Collection<ItemStack> populateLoot(Random random, LootContext context) {
LootTableInfo nmsContext = convertContext(context); LootTableInfo nmsContext = convertContext(context, random);
List<net.minecraft.world.item.ItemStack> nmsItems = handle.getRandomItems(nmsContext); List<net.minecraft.world.item.ItemStack> nmsItems = handle.getRandomItems(nmsContext);
Collection<ItemStack> bukkit = new ArrayList<>(nmsItems.size()); Collection<ItemStack> bukkit = new ArrayList<>(nmsItems.size());
@ -57,7 +57,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
@Override @Override
public void fillInventory(Inventory inventory, Random random, LootContext context) { public void fillInventory(Inventory inventory, Random random, LootContext context) {
LootTableInfo nmsContext = convertContext(context); LootTableInfo nmsContext = convertContext(context, random);
CraftInventory craftInventory = (CraftInventory) inventory; CraftInventory craftInventory = (CraftInventory) inventory;
IInventory handle = craftInventory.getInventory(); IInventory handle = craftInventory.getInventory();
@ -70,11 +70,14 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
return key; return key;
} }
private LootTableInfo convertContext(LootContext context) { private LootTableInfo convertContext(LootContext context, Random random) {
Location loc = context.getLocation(); Location loc = context.getLocation();
WorldServer handle = ((CraftWorld) loc.getWorld()).getHandle(); WorldServer handle = ((CraftWorld) loc.getWorld()).getHandle();
LootTableInfo.Builder builder = new LootTableInfo.Builder(handle); LootTableInfo.Builder builder = new LootTableInfo.Builder(handle);
if (random != null) {
builder = builder.withRandom(random);
}
setMaybe(builder, LootContextParameters.ORIGIN, new Vec3D(loc.getX(), loc.getY(), loc.getZ())); setMaybe(builder, LootContextParameters.ORIGIN, new Vec3D(loc.getX(), loc.getY(), loc.getZ()));
if (getHandle() != LootTable.EMPTY) { if (getHandle() != LootTable.EMPTY) {
// builder.luck(context.getLuck()); // builder.luck(context.getLuck());