Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop Tident#getItemStack() patch in favor of Paper's new Arrow#getItemStack() patch

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-20 21:06:37 -05:00
parent a8451af349
commit 9db91d62a9
68 changed files with 69 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
patches/server/0112-More-anvil-controls.patch Normal file
View File

@@ -0,0 +1,156 @@
From aff14f5361f3b98c2bf66fa61d766e1db14af17e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 19 Apr 2020 00:17:56 -0500
Subject: [PATCH] More anvil controls
---
.../net/minecraft/server/ContainerAnvil.java | 31 +++++++++++++++++--
.../inventory/CraftInventoryAnvil.java | 24 +++++++++++++-
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
index 286b930dd..d418c0441 100644
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger;
// CraftBukkit start
import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+import org.bukkit.inventory.AnvilInventory;
// CraftBukkit end
public class ContainerAnvil extends Container {
@@ -25,6 +26,8 @@ public class ContainerAnvil extends Container {
private int lastLevelCost;
private CraftInventoryView bukkitEntity;
private PlayerInventory playerInventory;
+ public boolean bypassCost = false; // Purpur
+ public boolean canDoUnsafeEnchants = false; // Purpur
// CraftBukkit end
public ContainerAnvil(int i, PlayerInventory playerinventory) {
@@ -56,12 +59,14 @@ public class ContainerAnvil extends Container {
@Override
public boolean isAllowed(EntityHuman entityhuman) {
- return (entityhuman.abilities.canInstantlyBuild || entityhuman.expLevel >= ContainerAnvil.this.levelCost.get()) && ContainerAnvil.this.levelCost.get() > 0 && this.hasItem();
+ return (entityhuman.abilities.canInstantlyBuild || entityhuman.expLevel >= ContainerAnvil.this.levelCost.get()) && (bypassCost || ContainerAnvil.this.levelCost.get() > 0) && this.hasItem(); // Purpur
}
@Override
public ItemStack a(EntityHuman entityhuman, ItemStack itemstack) {
+ if (net.pl3x.purpur.event.inventory.AnvilTakeResultEvent.getHandlerList().getRegisteredListeners().length > 0) new net.pl3x.purpur.event.inventory.AnvilTakeResultEvent(entityhuman.getBukkitEntity(), getBukkitView(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)).callEvent(); // Purpur
if (!entityhuman.abilities.canInstantlyBuild) {
+ if (bypassCost) ((EntityPlayer) entityhuman).lastSentExp = -1; else // Purpur
entityhuman.levelDown(-ContainerAnvil.this.levelCost.get());
}
@@ -136,6 +141,12 @@ public class ContainerAnvil extends Container {
}
public void e() {
+ // Purpur start
+ bypassCost = false;
+ canDoUnsafeEnchants = false;
+ if (net.pl3x.purpur.event.inventory.AnvilUpdateResultEvent.getHandlerList().getRegisteredListeners().length > 0) new net.pl3x.purpur.event.inventory.AnvilUpdateResultEvent(getBukkitView()).callEvent();
+ // Purpur end
+
ItemStack itemstack = this.repairInventory.getItem(0);
this.levelCost.set(1);
@@ -212,7 +223,7 @@ public class ContainerAnvil extends Container {
int i2 = (Integer) map1.get(enchantment);
i2 = l1 == i2 ? i2 + 1 : Math.max(i2, l1);
- boolean flag3 = enchantment.canEnchant(itemstack);
+ boolean flag3 = canDoUnsafeEnchants || enchantment.canEnchant(itemstack); // Purpur
if (this.player.abilities.canInstantlyBuild || itemstack.getItem() == Items.ENCHANTED_BOOK) {
flag3 = true;
@@ -224,7 +235,7 @@ public class ContainerAnvil extends Container {
Enchantment enchantment1 = (Enchantment) iterator1.next();
if (enchantment1 != enchantment && !enchantment.isCompatible(enchantment1)) {
- flag3 = false;
+ flag3 = canDoUnsafeEnchants; // Purpur
++i;
}
}
@@ -295,6 +306,13 @@ public class ContainerAnvil extends Container {
this.levelCost.set(maximumRepairCost - 1); // CraftBukkit
}
+ // Purpur start
+ if (bypassCost && levelCost.get() >= maximumRepairCost) {
+ itemstack.getOrCreateTagAndSet("Purpur.realCost", NBTTagInt.a(levelCost.get()));
+ levelCost.set(maximumRepairCost - 1);
+ }
+ // Purpur end
+
if (this.levelCost.get() >= maximumRepairCost && !this.player.abilities.canInstantlyBuild) { // CraftBukkit
itemstack1 = ItemStack.a;
}
@@ -316,6 +334,12 @@ public class ContainerAnvil extends Container {
org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), itemstack1); // CraftBukkit
this.c();
+ // Purpur start
+ if (canDoUnsafeEnchants && itemstack1 != ItemStack.NULL_ITEM) {
+ ((EntityPlayer) player).playerConnection.sendPacket(new PacketPlayOutSetSlot(windowId, 2, itemstack1));
+ ((EntityPlayer) player).playerConnection.sendPacket(new PacketPlayOutWindowData(windowId, 0, levelCost.get()));
+ }
+ // Purpur end
}
}
@@ -349,6 +373,7 @@ public class ContainerAnvil extends Container {
itemstack = itemstack1.cloneItemStack();
if (i == 2) {
+ if (net.pl3x.purpur.event.inventory.AnvilTakeResultEvent.getHandlerList().getRegisteredListeners().length > 0) new net.pl3x.purpur.event.inventory.AnvilTakeResultEvent(entityhuman.getBukkitEntity(), getBukkitView(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack)).callEvent(); // Purpur
if (!this.a(itemstack1, 3, 39, true)) {
return ItemStack.a;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
index 9374c2706..d45f356be 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java
@@ -9,7 +9,7 @@ import org.bukkit.inventory.AnvilInventory;
public class CraftInventoryAnvil extends CraftResultInventory implements AnvilInventory {
private final Location location;
- private final ContainerAnvil container;
+ public final ContainerAnvil container; // Purpur - private -> public
public CraftInventoryAnvil(Location location, IInventory inventory, IInventory resultInventory, ContainerAnvil container) {
super(inventory, resultInventory);
@@ -47,4 +47,26 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn
Preconditions.checkArgument(levels >= 0, "Maximum repair cost must be positive (or 0)");
container.maximumRepairCost = levels;
}
+
+ // Purpur start
+ @Override
+ public boolean canBypassCost() {
+ return container.bypassCost;
+ }
+
+ @Override
+ public void setBypassCost(boolean bypassCost) {
+ container.bypassCost = bypassCost;
+ }
+
+ @Override
+ public boolean canDoUnsafeEnchants() {
+ return container.canDoUnsafeEnchants;
+ }
+
+ @Override
+ public void setDoUnsafeEnchants(boolean canDoUnsafeEnchants) {
+ container.canDoUnsafeEnchants = canDoUnsafeEnchants;
+ }
+ // Purpur end
}
--
2.26.2