geforkt von Mirrors/Paper
18f0f8d1ca
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 312281ea PR-742: Make World implement Keyed CraftBukkit Changes: 2ac7fa7a SPIGOT-7014: getLootTable API should not persistently update loot table 7fdd7941 PR-1046: Make World implement Keyed 7bc728a6 PR-1045: Revert changes to persistence required checks Spigot Changes: b6d12d17 Rebuild patches
70 Zeilen
3.0 KiB
Diff
70 Zeilen
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sun, 26 Dec 2021 14:03:17 -0500
|
|
Subject: [PATCH] Bucketable API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/entity/PaperBucketable.java b/src/main/java/io/papermc/paper/entity/PaperBucketable.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..c4eee682f5b8cd82f71f92f0549f39b76e735cd8
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/entity/PaperBucketable.java
|
|
@@ -0,0 +1,31 @@
|
|
+package io.papermc.paper.entity;
|
|
+
|
|
+import org.bukkit.Sound;
|
|
+import org.bukkit.craftbukkit.CraftSound;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+
|
|
+public interface PaperBucketable extends Bucketable {
|
|
+
|
|
+ net.minecraft.world.entity.animal.Bucketable getHandle();
|
|
+
|
|
+ @Override
|
|
+ default boolean isFromBucket() {
|
|
+ return this.getHandle().fromBucket();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ default void setFromBucket(boolean fromBucket) {
|
|
+ this.getHandle().setFromBucket(fromBucket);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ default ItemStack getBaseBucketItem() {
|
|
+ return CraftItemStack.asBukkitCopy(this.getHandle().getBucketItemStack());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ default Sound getPickupSound() {
|
|
+ return CraftSound.getBukkit(this.getHandle().getPickupSound());
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
|
|
index cd751a13a29c34be1d084253f19bf2dce8399d01..cdaf860ec1b84c4ad9f2345968786d878f483f74 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
|
|
@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.entity.Axolotl;
|
|
import org.bukkit.entity.EntityType;
|
|
|
|
-public class CraftAxolotl extends CraftAnimals implements Axolotl {
|
|
+public class CraftAxolotl extends CraftAnimals implements Axolotl, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API
|
|
|
|
public CraftAxolotl(CraftServer server, net.minecraft.world.entity.animal.axolotl.Axolotl entity) {
|
|
super(server, entity);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
|
|
index 69d103a8ec74b17ee3116bb4d448494bd66f50b6..3c64461119391ec2e987fc936104e21ef0a95ce4 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
|
|
@@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.AbstractFish;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.entity.Fish;
|
|
|
|
-public class CraftFish extends CraftWaterMob implements Fish {
|
|
+public class CraftFish extends CraftWaterMob implements Fish, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API
|
|
|
|
public CraftFish(CraftServer server, AbstractFish entity) {
|
|
super(server, entity);
|