mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 12:02:36 +01:00
b3a8254758
By: md_5 <git@md-5.net>
33 lines
2 KiB
Diff
33 lines
2 KiB
Diff
--- a/net/minecraft/world/item/ItemBoat.java
|
|
+++ b/net/minecraft/world/item/ItemBoat.java
|
|
@@ -56,6 +56,13 @@
|
|
}
|
|
|
|
if (movingobjectpositionblock.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
|
|
+ // CraftBukkit start - Boat placement
|
|
+ org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), itemstack, enumhand);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return InteractionResultWrapper.pass(itemstack);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
EntityBoat entityboat = new EntityBoat(world, movingobjectpositionblock.getPos().x, movingobjectpositionblock.getPos().y, movingobjectpositionblock.getPos().z);
|
|
|
|
entityboat.setType(this.type);
|
|
@@ -64,7 +71,15 @@
|
|
return InteractionResultWrapper.fail(itemstack);
|
|
} else {
|
|
if (!world.isClientSide) {
|
|
- world.addEntity(entityboat);
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPlaceEvent(world, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), entityhuman, entityboat).isCancelled()) {
|
|
+ return InteractionResultWrapper.fail(itemstack);
|
|
+ }
|
|
+
|
|
+ if (!world.addEntity(entityboat)) {
|
|
+ return InteractionResultWrapper.pass(itemstack);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.a((Entity) entityhuman, GameEvent.ENTITY_PLACE, new BlockPosition(movingobjectpositionblock.getPos()));
|
|
if (!entityhuman.getAbilities().instabuild) {
|
|
itemstack.subtract(1);
|