mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 19:25:11 +02:00
928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
38 lines
1.8 KiB
Diff
38 lines
1.8 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/core/dispenser/DefaultDispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
|
|
index da6a145b06e217ff82b0a1b04410238dc50d4869..1e6ba6d9cceda1d4867b183c3dbc03d317ed287f 100644
|
|
--- a/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
|
|
+++ b/src/main/java/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
|
|
@@ -14,6 +14,7 @@ import org.bukkit.event.block.BlockDispenseEvent;
|
|
// CraftBukkit end
|
|
|
|
public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
|
|
+ private Direction enumdirection; // Paper
|
|
|
|
// CraftBukkit start
|
|
private boolean dropper;
|
|
@@ -27,15 +28,16 @@ public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
|
|
|
|
@Override
|
|
public final ItemStack dispense(BlockSource pointer, ItemStack stack) {
|
|
+ enumdirection = pointer.getBlockState().getValue(DispenserBlock.FACING); // Paper - cache facing direction
|
|
ItemStack itemstack1 = this.execute(pointer, stack);
|
|
|
|
this.playSound(pointer);
|
|
- this.playAnimation(pointer, (Direction) pointer.getBlockState().getValue(DispenserBlock.FACING));
|
|
+ this.playAnimation(pointer, enumdirection); // Paper - cache facing direction
|
|
return itemstack1;
|
|
}
|
|
|
|
protected ItemStack execute(BlockSource pointer, ItemStack stack) {
|
|
- Direction enumdirection = (Direction) pointer.getBlockState().getValue(DispenserBlock.FACING);
|
|
+ // Paper - cached enum direction
|
|
Position iposition = DispenserBlock.getDispensePosition(pointer);
|
|
ItemStack itemstack1 = stack.split(1);
|
|
|