Skip to content

Commit

Permalink
Merge branch 'Sandertv:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
didntpot authored Sep 4, 2024
2 parents 9ea2f8b + 8954c4a commit 61082f9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ Additionally, a MITM proxy is implemented in the [main.go file](https://github.c
Gophertunnel supports only one version at a time (generally the latest official Minecraft release), but multiple protocols can be supported with the API. Generally, a new
minor version is tagged when gophertunnel supports a new Minecraft version that was not previously supported.

## Sponsors
[![Become Patron](https://img.shields.io/badge/dynamic/json?logo=patreon&style=for-the-badge&color=%23e85b46&label=Patreon&query=data.attributes.patron_count&suffix=%20patrons&url=https%3A%2F%2Fwww.patreon.com%2Fapi%2Fcampaigns%2F2832539)](https://patreon.com/sandertv)

Gophertunnel is sponsored by all my gopher sponsors. A special thanks goes to the Very Important Gophers!

## Contact
[![Chat on Discord](https://img.shields.io/badge/Chat-On%20Discord-738BD7.svg?style=for-the-badge)](https://discord.com/invite/U4kFWHhTNR)

Expand Down
6 changes: 3 additions & 3 deletions minecraft/protocol/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ type ItemUsedEvent struct {
// Marshal ...
func (i *ItemUsedEvent) Marshal(r IO) {
r.Int16(&i.ItemID)
r.Varint32(&i.ItemAux)
r.Varint32(&i.UseMethod)
r.Varint32(&i.UseCount)
r.Int32(&i.ItemAux)
r.Int32(&i.UseMethod)
r.Int32(&i.UseCount)
}
4 changes: 2 additions & 2 deletions minecraft/protocol/packet/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
type Event struct {
// EntityRuntimeID is the runtime ID of the player. The runtime ID is unique for each world session, and
// entities are generally identified in packets using this runtime ID.
EntityRuntimeID uint64
EntityRuntimeID int64
// UsePlayerID ...
// TODO: Figure out what UsePlayerID is for.
UsePlayerID byte
Expand All @@ -23,7 +23,7 @@ func (*Event) ID() uint32 {
}

func (pk *Event) Marshal(io protocol.IO) {
io.Varuint64(&pk.EntityRuntimeID)
io.Varint64(&pk.EntityRuntimeID)
io.EventType(&pk.Event)
io.Uint8(&pk.UsePlayerID)
pk.Event.Marshal(io)
Expand Down

0 comments on commit 61082f9

Please sign in to comment.