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

Update to Minecraft 1.21

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,17 +123,12 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
if (context.getKiller() != null) {
EntityHuman nmsKiller = ((CraftHumanEntity) context.getKiller()).getHandle();
setMaybe(builder, LootContextParameters.KILLER_ENTITY, nmsKiller);
setMaybe(builder, LootContextParameters.ATTACKING_ENTITY, nmsKiller);
// If there is a player killer, damage source should reflect that in case loot tables use that information
setMaybe(builder, LootContextParameters.DAMAGE_SOURCE, handle.damageSources().playerAttack(nmsKiller));
setMaybe(builder, LootContextParameters.LAST_DAMAGE_PLAYER, nmsKiller); // SPIGOT-5603 - Set minecraft:killed_by_player
setMaybe(builder, LootContextParameters.TOOL, nmsKiller.getUseItem()); // SPIGOT-6925 - Set minecraft:match_tool
}
// SPIGOT-5603 - Use LootContext#lootingModifier
if (context.getLootingModifier() != LootContext.DEFAULT_LOOT_MODIFIER) {
setMaybe(builder, LootContextParameters.LOOTING_MOD, context.getLootingModifier());
}
}
// SPIGOT-5603 - Avoid IllegalArgumentException in LootTableInfo#build()
@@ -146,7 +141,6 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
nmsBuilder.optional(param);
}
}
nmsBuilder.optional(LootContextParameters.LOOTING_MOD);
return builder.create(getHandle().getParamSet());
}
@@ -165,8 +159,8 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
Location location = CraftLocation.toBukkit(position, info.getLevel().getWorld());
LootContext.Builder contextBuilder = new LootContext.Builder(location);
if (info.hasParam(LootContextParameters.KILLER_ENTITY)) {
CraftEntity killer = info.getParamOrNull(LootContextParameters.KILLER_ENTITY).getBukkitEntity();
if (info.hasParam(LootContextParameters.ATTACKING_ENTITY)) {
CraftEntity killer = info.getParamOrNull(LootContextParameters.ATTACKING_ENTITY).getBukkitEntity();
if (killer instanceof CraftHumanEntity) {
contextBuilder.killer((CraftHumanEntity) killer);
}
@@ -176,10 +170,6 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
contextBuilder.lootedEntity(info.getParamOrNull(LootContextParameters.THIS_ENTITY).getBukkitEntity());
}
if (info.hasParam(LootContextParameters.LOOTING_MOD)) {
contextBuilder.lootingModifier(info.getParamOrNull(LootContextParameters.LOOTING_MOD));
}
contextBuilder.luck(info.getLuck());
return contextBuilder.build();
}