Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix PlayerDiedEventData #148

Merged
merged 2 commits into from Aug 26, 2022
Merged

Fix PlayerDiedEventData #148

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8c16cd
Fix PlayerDiedEventData
egor-erm Aug 26, 2022
3693999
Update events.go
egor-erm Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion minecraft/protocol/events.go
View file
Open in desktop
Expand Up @@ -110,14 +110,28 @@ func (c *CauldronUsedEventData) Marshal(r IO) {
type PlayerDiedEventData struct {
// AttackerEntityID ...
AttackerEntityID int32
// AttackerVariant ...
AttackerVariant int32
// EntityDamageCause ...
EntityDamageCause int32
// InRaid ...
InRaid bool
}

// Marshal ...
func (p *PlayerDiedEventData) Marshal(r IO) {
func (p *PlayerDiedEventData) Marshal(w *Writer) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this compiles. Implementations of the protocol.EventData interface must (only) implement a Marshal(r IO) interface.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I didn't notice that

w.Varint32(&p.AttackerEntityID)
w.Varint32(&p.AttackerVariant)
w.Varint32(&p.EntityDamageCause)
w.Bool(&p.InRaid)
}

// Unmarshal ...
func (p *PlayerDiedEventData) Unmarshal(r *Reader) {
r.Varint32(&p.AttackerEntityID)
r.Varint32(&p.AttackerVariant)
r.Varint32(&p.EntityDamageCause)
r.Bool(&p.InRaid)
}

// BossKilledEventData is the event data sent when a boss dies.
Expand Down