craftbukkit/nms-patches/net/minecraft/world/inventory/ContainerAnvil.patch

105 lines
4.3 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/inventory/ContainerAnvil.java
+++ b/net/minecraft/world/inventory/ContainerAnvil.java
2021-06-11 15:00:00 +10:00
@@ -19,6 +19,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
2016-11-17 12:41:03 +11:00
+// CraftBukkit start
2016-03-01 08:32:46 +11:00
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+// CraftBukkit end
+
2020-06-25 10:00:00 +10:00
public class ContainerAnvil extends ContainerAnvilAbstract {
2019-04-25 12:00:00 +10:00
private static final Logger LOGGER = LogManager.getLogger();
2021-06-11 15:00:00 +10:00
@@ -34,6 +38,10 @@
private static final int COST_REPAIR_SACRIFICE = 2;
private static final int COST_INCOMPATIBLE_PENALTY = 1;
private static final int COST_RENAME = 1;
+ // CraftBukkit start
+ public int maximumRepairCost = 40;
2016-11-17 12:41:03 +11:00
+ private CraftInventoryView bukkitEntity;
2015-02-26 22:41:06 +00:00
+ // CraftBukkit end
2019-04-23 12:00:00 +10:00
public ContainerAnvil(int i, PlayerInventory playerinventory) {
2021-06-11 15:00:00 +10:00
this(i, playerinventory, ContainerAccess.NULL);
2021-07-07 00:00:00 +10:00
@@ -106,7 +114,7 @@
2016-03-01 08:32:46 +11:00
byte b1 = 0;
2016-11-17 12:41:03 +11:00
if (itemstack.isEmpty()) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
this.cost.set(0);
2016-03-01 08:32:46 +11:00
} else {
ItemStack itemstack1 = itemstack.cloneItemStack();
2021-07-07 00:00:00 +10:00
@@ -124,7 +132,7 @@
2021-06-11 15:00:00 +10:00
if (itemstack1.f() && itemstack1.getItem().a(itemstack, itemstack2)) {
k = Math.min(itemstack1.getDamage(), itemstack1.i() / 4);
2016-03-01 08:32:46 +11:00
if (k <= 0) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
this.cost.set(0);
2016-03-01 08:32:46 +11:00
return;
}
2021-07-07 00:00:00 +10:00
@@ -139,7 +147,7 @@
2021-06-11 15:00:00 +10:00
this.repairItemCountCost = i1;
2016-03-01 08:32:46 +11:00
} else {
2021-06-11 15:00:00 +10:00
if (!flag && (!itemstack1.a(itemstack2.getItem()) || !itemstack1.f())) {
- this.resultSlots.setItem(0, ItemStack.EMPTY);
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
this.cost.set(0);
return;
}
2021-07-07 00:00:00 +10:00
@@ -229,7 +237,7 @@
}
if (flag2 && !flag1) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
this.cost.set(0);
2016-03-01 08:32:46 +11:00
return;
}
2021-07-07 00:00:00 +10:00
@@ -253,11 +261,11 @@
2021-06-11 15:00:00 +10:00
itemstack1 = ItemStack.EMPTY;
}
2021-06-11 15:00:00 +10:00
- if (b1 == i && b1 > 0 && this.cost.get() >= 40) {
- this.cost.set(39);
+ if (b1 == i && b1 > 0 && this.cost.get() >= maximumRepairCost) { // CraftBukkit
+ this.cost.set(maximumRepairCost - 1); // CraftBukkit
}
2021-06-11 15:00:00 +10:00
- if (this.cost.get() >= 40 && !this.player.getAbilities().instabuild) {
+ if (this.cost.get() >= maximumRepairCost && !this.player.getAbilities().instabuild) { // CraftBukkit
itemstack1 = ItemStack.EMPTY;
}
@@ -276,7 +284,8 @@
2016-03-01 08:32:46 +11:00
EnchantmentManager.a(map, itemstack1);
}
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, itemstack1);
2016-03-01 08:32:46 +11:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), itemstack1); // CraftBukkit
+ updateInventory(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
2021-06-11 15:00:00 +10:00
this.d();
2016-03-01 08:32:46 +11:00
}
}
@@ -303,4 +312,18 @@
2021-07-07 00:00:00 +10:00
public int m() {
2021-06-11 15:00:00 +10:00
return this.cost.get();
}
2016-11-17 12:41:03 +11:00
+
+ // CraftBukkit start
+ @Override
+ public CraftInventoryView getBukkitView() {
+ if (bukkitEntity != null) {
+ return bukkitEntity;
+ }
+
2016-03-01 08:32:46 +11:00
+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryAnvil(
2021-06-11 15:00:00 +10:00
+ access.getLocation(), this.inputSlots, this.resultSlots, this);
2018-12-13 11:00:00 +11:00
+ bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(), inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
2016-11-17 12:41:03 +11:00
}