mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-17 13:24:17 -07:00
Update to Minecraft 1.16.1
This commit is contained in:
@@ -3,26 +3,24 @@
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
public void setItem(ItemStack itemstack) {
|
||||
if (itemstack.getItem() != this.i() || itemstack.hasTag()) {
|
||||
- this.getDataWatcher().set(EntityProjectileThrowable.e, SystemUtils.a((Object) itemstack.cloneItemStack(), (itemstack1) -> {
|
||||
if (itemstack.getItem() != this.getDefaultItem() || itemstack.hasTag()) {
|
||||
- this.getDataWatcher().set(EntityProjectileThrowable.b, SystemUtils.a((Object) itemstack.cloneItemStack(), (itemstack1) -> {
|
||||
- itemstack1.setCount(1);
|
||||
+ this.getDataWatcher().set(EntityProjectileThrowable.e, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // CraftBukkit - decompile error
|
||||
+ this.getDataWatcher().set(EntityProjectileThrowable.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // CraftBukkit - decompile error
|
||||
+ if (!itemstack1.isEmpty()) itemstack1.setCount(1); // CraftBukkit
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -27,7 +27,13 @@
|
||||
@@ -27,6 +27,12 @@
|
||||
|
||||
protected abstract Item i();
|
||||
protected abstract Item getDefaultItem();
|
||||
|
||||
- protected ItemStack getItem() {
|
||||
+ // CraftBukkit start
|
||||
+ public Item getDefaultItem() {
|
||||
+ return i();
|
||||
+ public Item getDefaultItemPublic() {
|
||||
+ return getDefaultItem();
|
||||
+ }
|
||||
+ // CraftBukkit end
|
||||
+
|
||||
+ public ItemStack getItem() { // PAIL protected -> public
|
||||
return (ItemStack) this.getDataWatcher().get(EntityProjectileThrowable.e);
|
||||
public ItemStack getItem() {
|
||||
return (ItemStack) this.getDataWatcher().get(EntityProjectileThrowable.b);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user