SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.15

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/nms-patches/ItemArmor.patch
View File

@@ -12,7 +12,7 @@
public class ItemArmor extends Item {
private static final UUID[] k = new UUID[]{UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"), UUID.fromString("D8499B04-0E66-4726-AB29-64469D734E0D"), UUID.fromString("9F3D476D-C118-4544-8365-64846904B48E"), UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150")};
@@ -30,6 +35,32 @@
@@ -28,6 +33,32 @@
EntityLiving entityliving = (EntityLiving) list.get(0);
EnumItemSlot enumitemslot = EntityInsentient.h(itemstack);
ItemStack itemstack1 = itemstack.cloneAndSubtract(1);
@@ -28,7 +28,7 @@
+
+ if (event.isCancelled()) {
+ itemstack.add(1);
+ return itemstack;
+ return false;
+ }
+
+ if (!event.getItem().equals(craftItem)) {
@@ -38,7 +38,7 @@
+ IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
+ if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != ItemArmor.a) {
+ idispensebehavior.dispense(isourceblock, eventStack);
+ return itemstack;
+ return true;
+ }
+ }
+ // CraftBukkit end