mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
89d51d5f29
Because this exploit has been widely known for years and has not been fixed by Mojang, we decided that it was worth allowing people to toggle it on/off due to how easy it is to make it configurable. It should be noted that this decision does not promise all future exploits will be configurable.
60 lines
3.8 KiB
Diff
60 lines
3.8 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 8289ea080aa297f75cdbc8d591d6efa6a0def0ea..3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java
|
|
@@ -3,6 +3,7 @@ package net.minecraft.world.entity.decoration;
|
|
import com.mojang.logging.LogUtils;
|
|
import java.util.OptionalInt;
|
|
import javax.annotation.Nullable;
|
|
+import io.papermc.paper.event.player.PlayerItemFrameChangeEvent; // Paper - Add PlayerItemFrameChangeEvent
|
|
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 - Add 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 true; // return true here because you aren't cancelling the damage, just the change
|
|
+ this.setItem(ItemStack.fromBukkitCopy(event.getItemStack()), false);
|
|
+ }
|
|
+ // Paper end - Add PlayerItemFrameChangeEvent
|
|
this.dropItem(source.getEntity(), false);
|
|
this.gameEvent(GameEvent.BLOCK_CHANGE, source.getEntity());
|
|
this.playSound(this.getRemoveItemSound(), 1.0F, 1.0F);
|
|
@@ -451,13 +459,26 @@ public class ItemFrame extends HangingEntity {
|
|
}
|
|
}
|
|
|
|
- this.setItem(itemstack);
|
|
+ // Paper start - Add PlayerItemFrameChangeEvent
|
|
+ PlayerItemFrameChangeEvent 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()));
|
|
+ // Paper end - Add PlayerItemFrameChangeEvent
|
|
this.gameEvent(GameEvent.BLOCK_CHANGE, player);
|
|
if (!player.getAbilities().instabuild) {
|
|
itemstack.shrink(1);
|
|
}
|
|
}
|
|
} else {
|
|
+ // Paper start - Add PlayerItemFrameChangeEvent
|
|
+ PlayerItemFrameChangeEvent 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 - Add PlayerItemFrameChangeEvent
|
|
this.playSound(this.getRotateItemSound(), 1.0F, 1.0F);
|
|
this.setRotation(this.getRotation() + 1);
|
|
this.gameEvent(GameEvent.BLOCK_CHANGE, player);
|