Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-3368: Allow anvil level cost to be overwritten by properties

Browse Source
This commit is contained in:
md_5 2017-06-23 20:35:17 +10:00
parent 1314229dc2
commit 763827668e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nms-patches/ContainerAnvil.patch
View File

@ -11,11 +11,12 @@
public class ContainerAnvil extends Container { public class ContainerAnvil extends Container {
private static final Logger f = LogManager.getLogger(); private static final Logger f = LogManager.getLogger();
@@ -22,8 +26,13 @@ @@ -22,8 +26,14 @@
private int k; private int k;
public String renameText; public String renameText;
private final EntityHuman m; private final EntityHuman m;
+ // CraftBukkit start + // CraftBukkit start
+ private int lastLevelCost;
+ private CraftInventoryView bukkitEntity; + private CraftInventoryView bukkitEntity;
+ private PlayerInventory player; + private PlayerInventory player;
+ // CraftBukkit end + // CraftBukkit end
@ -25,7 +26,7 @@
this.j = blockposition; this.j = blockposition;
this.i = world; this.i = world;
this.m = entityhuman; this.m = entityhuman;
@@ -110,7 +119,7 @@ @@ -110,7 +120,7 @@
byte b1 = 0; byte b1 = 0;
if (itemstack.isEmpty()) { if (itemstack.isEmpty()) {
@ -34,7 +35,7 @@
this.levelCost = 0; this.levelCost = 0;
} else { } else {
ItemStack itemstack1 = itemstack.cloneItemStack(); ItemStack itemstack1 = itemstack.cloneItemStack();
@@ -128,7 +137,7 @@ @@ -128,7 +138,7 @@
if (itemstack1.f() && itemstack1.getItem().a(itemstack, itemstack2)) { if (itemstack1.f() && itemstack1.getItem().a(itemstack, itemstack2)) {
k = Math.min(itemstack1.i(), itemstack1.k() / 4); k = Math.min(itemstack1.i(), itemstack1.k() / 4);
if (k <= 0) { if (k <= 0) {
@ -43,7 +44,7 @@
this.levelCost = 0; this.levelCost = 0;
return; return;
} }
@@ -143,7 +152,7 @@ @@ -143,7 +153,7 @@
this.k = l; this.k = l;
} else { } else {
if (!flag && (itemstack1.getItem() != itemstack2.getItem() || !itemstack1.f())) { if (!flag && (itemstack1.getItem() != itemstack2.getItem() || !itemstack1.f())) {
@ -52,7 +53,7 @@
this.levelCost = 0; this.levelCost = 0;
return; return;
} }
@@ -236,7 +245,7 @@ @@ -236,7 +246,7 @@
} }
if (flag2 && !flag1) { if (flag2 && !flag1) {
@ -61,7 +62,7 @@
this.levelCost = 0; this.levelCost = 0;
return; return;
} }
@@ -283,7 +292,7 @@ @@ -283,7 +293,7 @@
EnchantmentManager.a(map, itemstack1); EnchantmentManager.a(map, itemstack1);
} }
@ -70,7 +71,7 @@
this.b(); this.b();
} }
} }
@@ -301,6 +310,7 @@ @@ -301,6 +311,7 @@
} }
public boolean a(EntityHuman entityhuman) { public boolean a(EntityHuman entityhuman) {
@ -78,7 +79,7 @@
return this.i.getType(this.j).getBlock() != Blocks.ANVIL ? false : entityhuman.d((double) this.j.getX() + 0.5D, (double) this.j.getY() + 0.5D, (double) this.j.getZ() + 0.5D) <= 64.0D; return this.i.getType(this.j).getBlock() != Blocks.ANVIL ? false : entityhuman.d((double) this.j.getX() + 0.5D, (double) this.j.getY() + 0.5D, (double) this.j.getZ() + 0.5D) <= 64.0D;
} }
@@ -356,4 +366,29 @@ @@ -356,4 +367,33 @@
this.e(); this.e();
} }
@ -91,10 +92,14 @@
+ for (int i = 0; i < this.listeners.size(); ++i) { + for (int i = 0; i < this.listeners.size(); ++i) {
+ ICrafting icrafting = (ICrafting) this.listeners.get(i); + ICrafting icrafting = (ICrafting) this.listeners.get(i);
+ +
+ if (this.lastLevelCost != this.levelCost) {
+ icrafting.setContainerData(this, 0, this.levelCost); + icrafting.setContainerData(this, 0, this.levelCost);
+ } + }
+ } + }
+ +
+ this.lastLevelCost = this.levelCost;
+ }
+
+ @Override + @Override
+ public CraftInventoryView getBukkitView() { + public CraftInventoryView getBukkitView() {
+ if (bukkitEntity != null) { + if (bukkitEntity != null) {