diff options
| author | Jake Potrebic <[email protected]> | 2021-10-02 10:21:49 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-02 10:21:49 -0700 |
| commit | cc38c16e75fc178c36bfd0b436da2ac2a8870d39 (patch) | |
| tree | 9d555069cb7597dd4b8eb68ff5bde2708b82eb14 /patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch | |
| parent | e8830b27e3b08f75c924ef81c2de096ac73c9c1c (diff) | |
| download | Paper-cc38c16e75fc178c36bfd0b436da2ac2a8870d39.tar.gz Paper-cc38c16e75fc178c36bfd0b436da2ac2a8870d39.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#6638)
Diffstat (limited to 'patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch')
| -rw-r--r-- | patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch index 255d488d11..cfe669c3de 100644 --- a/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/patches/server/0092-LootTable-API-Replenishable-Lootables-Feature.patch @@ -642,7 +642,7 @@ index b79d9d26a8e60f9c0ecd69e9c2f9cfd087e21d23..f23fff80d07ac7d06715efe67cb49ebb if (player != null) { builder.withLuck(player.getLuck()).withParameter(LootContextParams.THIS_ENTITY, player); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java -index bbe1ddca74a174a3da38475f586b5b61ae3abad3..4d84bcdfb17a3d1bc79e5ec2b201739fa0db1bd3 100644 +index d929ad6bd8af7b6676c08f8747ac0f93b85482fb..189674ce35f2da75a70e4a05c77dd022cef469db 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -14,8 +14,9 @@ import org.bukkit.craftbukkit.CraftWorld; @@ -654,21 +654,21 @@ index bbe1ddca74a174a3da38475f586b5b61ae3abad3..4d84bcdfb17a3d1bc79e5ec2b201739f -public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest { +public class CraftChest extends CraftLootable<ChestBlockEntity> implements Chest, PaperLootableBlockInventory { // Paper - public CraftChest(final Block block) { - super(block, ChestBlockEntity.class); + public CraftChest(World world, ChestBlockEntity tileEntity) { + super(world, tileEntity); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -index a688845f6b8fc3de2864dd896cd132b5c7b3be59..322a8292876b3b4eb73cff2ef768f4b9325b2bdb 100644 +index 982adacb361b0590799dc68f9b7c13c7195627fd..e49eece9bff3a53469673d03a7bbf8f9cf8776b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -@@ -10,7 +10,7 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey; +@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.util.CraftNamespacedKey; import org.bukkit.loot.LootTable; import org.bukkit.loot.Lootable; -public abstract class CraftLootable<T extends RandomizableContainerBlockEntity> extends CraftContainer<T> implements Nameable, Lootable { +public abstract class CraftLootable<T extends RandomizableContainerBlockEntity> extends CraftContainer<T> implements Nameable, Lootable, com.destroystokyo.paper.loottable.PaperLootableBlockInventory { // Paper - public CraftLootable(Block block, Class<T> tileEntityClass) { - super(block, tileEntityClass); + public CraftLootable(World world, T tileEntity) { + super(world, tileEntity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java index eb21b8457774d5ac765fa9008157cb29d9b72509..abf58bef2042a9efba5a78fd7f97339deceaa780 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java |