SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/src/main/java/org/bukkit/craftbukkit/CraftLootTable.java
View File

@@ -82,7 +82,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
Entity nmsLootedEntity = ((CraftEntity) context.getLootedEntity()).getHandle();
builder.set(LootContextParameters.THIS_ENTITY, nmsLootedEntity);
builder.set(LootContextParameters.DAMAGE_SOURCE, DamageSource.GENERIC);
builder.set(LootContextParameters.POSITION, new BlockPosition(nmsLootedEntity));
builder.set(LootContextParameters.POSITION, nmsLootedEntity.getChunkCoordinates());
}
if (context.getKiller() != null) {
@@ -100,23 +100,23 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
}
// SPIGOT-5603 - Avoid IllegalArgumentException in LootTableInfo#build()
LootContextParameterSet.a nmsBuilder = new LootContextParameterSet.a(); // PAIL rename Builder
for (LootContextParameter<?> param : getHandle().getLootContextParameterSet().a()) { // PAIL rename required
nmsBuilder.a(param); // PAIL rename addRequired
LootContextParameterSet.Builder nmsBuilder = new LootContextParameterSet.Builder();
for (LootContextParameter<?> param : getHandle().getLootContextParameterSet().getRequired()) {
nmsBuilder.addRequired(param);
}
for (LootContextParameter<?> param : getHandle().getLootContextParameterSet().b()) { // PAIL rename optional
if (!getHandle().getLootContextParameterSet().a().contains(param)) { // PAIL rename required
nmsBuilder.b(param); // PAIL rename addOptional
for (LootContextParameter<?> param : getHandle().getLootContextParameterSet().getOptional()) {
if (!getHandle().getLootContextParameterSet().getRequired().contains(param)) {
nmsBuilder.addOptional(param);
}
}
nmsBuilder.b(LootContextParameters.LOOTING_MOD); // PAIL rename addOptional
nmsBuilder.addOptional(LootContextParameters.LOOTING_MOD);
return builder.build(nmsBuilder.a()); // PAIL rename build
return builder.build(nmsBuilder.build());
}
public static LootContext convertContext(LootTableInfo info) {
BlockPosition position = info.getContextParameter(LootContextParameters.POSITION);
Location location = new Location(info.c().getWorld(), position.getX(), position.getY(), position.getZ()); // PAIL rename getWorld
Location location = new Location(info.getWorld().getWorld(), position.getX(), position.getY(), position.getZ());
LootContext.Builder contextBuilder = new LootContext.Builder(location);
if (info.hasContextParameter(LootContextParameters.KILLER_ENTITY)) {
@@ -134,7 +134,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
contextBuilder.lootingModifier(info.getContextParameter(LootContextParameters.LOOTING_MOD));
}
contextBuilder.luck(info.b()); // PAIL rename getLuck
contextBuilder.luck(info.getLuck());
return contextBuilder.build();
}