mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
1ab021ddca
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
Date: Sun, 23 Aug 2020 19:01:04 +0200
|
|
Subject: [PATCH] Don't require FACING data
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
|
|
index ca5eae350b971e93df708a29c426609423645430..40ac372281ba19cb776c14ffc957481367148f27 100644
|
|
--- a/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
|
|
+++ b/src/main/java/net/minecraft/server/DispenseBehaviorItem.java
|
|
@@ -7,20 +7,22 @@ import org.bukkit.event.block.BlockDispenseEvent;
|
|
// CraftBukkit end
|
|
|
|
public class DispenseBehaviorItem implements IDispenseBehavior {
|
|
+ private EnumDirection enumdirection; // Paper
|
|
|
|
public DispenseBehaviorItem() {}
|
|
|
|
@Override
|
|
public final ItemStack dispense(ISourceBlock isourceblock, ItemStack itemstack) {
|
|
+ enumdirection = isourceblock.getBlockData().get(BlockDispenser.FACING); // Paper - cache facing direction
|
|
ItemStack itemstack1 = this.a(isourceblock, itemstack);
|
|
|
|
this.a(isourceblock);
|
|
- this.a(isourceblock, (EnumDirection) isourceblock.getBlockData().get(BlockDispenser.FACING));
|
|
+ this.a(isourceblock, enumdirection); // Paper - cache facing direction
|
|
return itemstack1;
|
|
}
|
|
|
|
protected ItemStack a(ISourceBlock isourceblock, ItemStack itemstack) {
|
|
- EnumDirection enumdirection = (EnumDirection) isourceblock.getBlockData().get(BlockDispenser.FACING);
|
|
+ // Paper - cached enum direction
|
|
IPosition iposition = BlockDispenser.a(isourceblock);
|
|
ItemStack itemstack1 = itemstack.cloneAndSubtract(1);
|
|
|