Skip to content

Commit a80d69a

Browse files
authored
Handle hand swap entity status (#3097)
1 parent 5a55744 commit a80d69a

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

docs/api.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
- ["entityTamed" (entity)](#entitytamed-entity)
188188
- ["entityShakingOffWater" (entity)](#entityshakingoffwater-entity)
189189
- ["entityEatingGrass" (entity)](#entityeatinggrass-entity)
190+
- ["entityHandSwap" (entity)](#entityhandswap-entity)
190191
- ["entityWake" (entity)](#entitywake-entity)
191192
- ["entityEat" (entity)](#entityeat-entity)
192193
- ["entityCriticalEffect" (entity)](#entitycriticaleffect-entity)
@@ -1290,6 +1291,7 @@ Fires when an attribute of an entity changes.
12901291
#### "entityTamed" (entity)
12911292
#### "entityShakingOffWater" (entity)
12921293
#### "entityEatingGrass" (entity)
1294+
#### "entityHandSwap" (entity)
12931295
#### "entityWake" (entity)
12941296
#### "entityEat" (entity)
12951297
#### "entityCriticalEffect" (entity)

index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export interface BotEvents {
8282
entityTamed: (entity: Entity) => Promise<void> | void
8383
entityShakingOffWater: (entity: Entity) => Promise<void> | void
8484
entityEatingGrass: (entity: Entity) => Promise<void> | void
85+
entityHandSwap: (entity: Entity) => Promise<void> | void
8586
entityWake: (entity: Entity) => Promise<void> | void
8687
entityEat: (entity: Entity) => Promise<void> | void
8788
entityCriticalEffect: (entity: Entity) => Promise<void> | void

lib/plugins/entities.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ const entityStatusEvents = {
2121
6: 'entityTaming',
2222
7: 'entityTamed',
2323
8: 'entityShakingOffWater',
24-
10: 'entityEatingGrass'
24+
10: 'entityEatingGrass',
25+
55: 'entityHandSwap'
2526
}
2627

2728
function inject (bot) {
@@ -338,6 +339,12 @@ function inject (bot) {
338339
// entity status
339340
const entity = fetchEntity(packet.entityId)
340341
const eventName = entityStatusEvents[packet.entityStatus]
342+
343+
if (eventName === 'entityHandSwap' && entity.equipment) {
344+
[entity.equipment[0], entity.equipment[1]] = [entity.equipment[1], entity.equipment[0]]
345+
entity.heldItem = entity.equipment[0] // Update held item like prismarine-entity does upon equipment updates
346+
}
347+
341348
if (eventName) bot.emit(eventName, entity)
342349
})
343350

0 commit comments

Comments
 (0)