58 lines
3.3 KiB
Diff
58 lines
3.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: SamB440 <sam@islandearth.net>
|
||
|
|
Date: Mon, 15 Nov 2021 18:10:10 +0000
|
||
|
|
Subject: [PATCH] Add PlayerItemFrameChangeEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
|
||
|
|
index 30159f4f387b61b50589fad61f91c9e5a4adaf12..0f8513ee6f56148cf63f4cd6a60acb7f70280ff1 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
|
||
|
|
@@ -1,6 +1,7 @@
|
||
|
|
package net.minecraft.world.entity.decoration;
|
||
|
|
|
||
|
|
import javax.annotation.Nullable;
|
||
|
|
+import io.papermc.paper.event.player.PlayerItemFrameChangeEvent; // Paper
|
||
|
|
import net.minecraft.core.BlockPos;
|
||
|
|
import net.minecraft.core.Direction;
|
||
|
|
import net.minecraft.nbt.CompoundTag;
|
||
|
|
@@ -185,6 +186,13 @@ public class ItemFrame extends HangingEntity {
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
+ // Paper start - call PlayerItemFrameChangeEvent
|
||
|
|
+ if (source.getEntity() instanceof Player player) {
|
||
|
|
+ var event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.REMOVE);
|
||
|
|
+ if (!event.callEvent()) return false;
|
||
|
|
+ this.setItem(ItemStack.fromBukkitCopy(event.getItemStack()), false);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
this.dropItem(source.getEntity(), false);
|
||
|
|
this.playSound(this.getRemoveItemSound(), 1.0F, 1.0F);
|
||
|
|
}
|
||
|
|
@@ -427,13 +435,22 @@ public class ItemFrame extends HangingEntity {
|
||
|
|
return InteractionResult.FAIL;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
-
|
||
|
|
- this.setItem(itemstack);
|
||
|
|
+ // Paper start - call PlayerItemFrameChangeEvent
|
||
|
|
+ var event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), itemstack.asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.PLACE);
|
||
|
|
+ if (!event.callEvent()) return InteractionResult.FAIL;
|
||
|
|
+ this.setItem(ItemStack.fromBukkitCopy(event.getItemStack()));
|
||
|
|
+ // this.setItem(itemstack);
|
||
|
|
+ // Paper end
|
||
|
|
if (!player.getAbilities().instabuild) {
|
||
|
|
itemstack.shrink(1);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
} else {
|
||
|
|
+ // Paper start - call PlayerItemFrameChangeEvent
|
||
|
|
+ var event = new PlayerItemFrameChangeEvent((org.bukkit.entity.Player) player.getBukkitEntity(), (org.bukkit.entity.ItemFrame) this.getBukkitEntity(), this.getItem().asBukkitCopy(), PlayerItemFrameChangeEvent.ItemFrameChangeAction.ROTATE);
|
||
|
|
+ if (!event.callEvent()) return InteractionResult.FAIL;
|
||
|
|
+ setItem(ItemStack.fromBukkitCopy(event.getItemStack()), false, false);
|
||
|
|
+ // Paper end
|
||
|
|
this.playSound(this.getRotateItemSound(), 1.0F, 1.0F);
|
||
|
|
this.setRotation(this.getRotation() + 1);
|
||
|
|
}
|