1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
--- a/net/minecraft/world/item/LeadItem.java
+++ b/net/minecraft/world/item/LeadItem.java
@@ -11,6 +14,10 @@
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.phys.AABB;
+// CraftBukkit start
+import org.bukkit.craftbukkit.CraftEquipmentSlot;
+import org.bukkit.event.hanging.HangingPlaceEvent;
+// CraftBukkit end
public class LeadItem extends Item {
public LeadItem(Item.Properties properties) {
@@ -19,13 +27,15 @@
@Override
public InteractionResult useOn(UseOnContext context) {
- Level level = context.getLevel();
- BlockPos clickedPos = context.getClickedPos();
- BlockState blockState = level.getBlockState(clickedPos);
- if (blockState.is(BlockTags.FENCES)) {
- Player player = context.getPlayer();
- if (!level.isClientSide && player != null) {
- bindPlayerMobs(player, level, clickedPos);
+ Level world = context.getLevel();
+ BlockPos blockposition = context.getClickedPos();
+ IBlockData iblockdata = world.getBlockState(blockposition);
+
+ if (iblockdata.is(BlockTags.FENCES)) {
+ Player entityhuman = context.getPlayer();
+
+ if (!world.isClientSide && entityhuman != null) {
+ bindPlayerMobs(entityhuman, world, blockposition, context.getHand()); // CraftBukkit - Pass hand
}
return InteractionResult.sidedSuccess(level.isClientSide);
@@ -34,24 +44,41 @@
}
}
- public static InteractionResult bindPlayerMobs(Player player, Level level, BlockPos pos) {
- LeashFenceKnotEntity leashFenceKnotEntity = null;
+ public static InteractionResult bindPlayerMobs(Player entityhuman, Level world, BlockPos blockposition, net.minecraft.world.EnumHand enumhand) { // CraftBukkit - Add EnumHand
+ LeashFenceKnotEntity entityleash = null;
boolean flag = false;
double d = 7.0;
int x = pos.getX();
int y = pos.getY();
int z = pos.getZ();
- for (Mob mob : level.getEntitiesOfClass(
- Mob.class, new AABB((double)x - 7.0, (double)y - 7.0, (double)z - 7.0, (double)x + 7.0, (double)y + 7.0, (double)z + 7.0)
- )) {
- if (mob.getLeashHolder() == player) {
- if (leashFenceKnotEntity == null) {
- leashFenceKnotEntity = LeashFenceKnotEntity.getOrCreateKnot(level, pos);
- leashFenceKnotEntity.playPlacementSound();
+ while (iterator.hasNext()) {
+ Mob entityinsentient = (Mob) iterator.next();
+
+ if (entityinsentient.getLeashHolder() == entityhuman) {
+ if (entityleash == null) {
+ entityleash = LeashFenceKnotEntity.getOrCreateKnot(world, blockposition);
+
+ // CraftBukkit start - fire HangingPlaceEvent
+ org.bukkit.inventory.EquipmentSlot hand = CraftEquipmentSlot.getHand(enumhand);
+ HangingPlaceEvent event = new HangingPlaceEvent((org.bukkit.entity.Hanging) entityleash.getBukkitEntity(), entityhuman != null ? (org.bukkit.entity.Player) entityhuman.getBukkitEntity() : null, world.getWorld().getBlockAt(i, j, k), org.bukkit.block.BlockFace.SELF, hand);
+ world.getCraftServer().getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) {
+ entityleash.discard();
+ return InteractionResult.PASS;
+ }
+ // CraftBukkit end
+ entityleash.playPlacementSound();
}
- mob.setLeashedTo(leashFenceKnotEntity, true);
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerLeashEntityEvent(entityinsentient, entityleash, entityhuman, enumhand).isCancelled()) {
+ continue;
+ }
+ // CraftBukkit end
+
+ entityinsentient.setLeashedTo(entityleash, true);
flag = true;
}
}
@@ -62,4 +91,10 @@
return flag ? InteractionResult.SUCCESS : InteractionResult.PASS;
}
+
+ // CraftBukkit start
+ public static InteractionResult bindPlayerMobs(Player player, Level level, BlockPos pos) {
+ return bindPlayerMobs(player, level, pos, net.minecraft.world.EnumHand.MAIN_HAND);
+ }
+ // CraftBukkit end
}
|
